Merge "msm: sde: Fix kernel crash after stop streaming timeout"

This commit is contained in:
Linux Build Service Account 2017-04-25 21:48:37 -07:00 committed by Gerrit - the friendly Code Review server
commit 330663d26e

View file

@ -465,6 +465,10 @@ static void sde_rotator_stop_streaming(struct vb2_queue *q)
sde_rot_mgr_lock(rot_dev->mgr); sde_rot_mgr_lock(rot_dev->mgr);
sde_rotator_cancel_all_requests(rot_dev->mgr, ctx->private); sde_rotator_cancel_all_requests(rot_dev->mgr, ctx->private);
sde_rot_mgr_unlock(rot_dev->mgr); sde_rot_mgr_unlock(rot_dev->mgr);
mutex_unlock(q->lock);
cancel_work_sync(&ctx->submit_work);
cancel_work_sync(&ctx->retire_work);
mutex_lock(q->lock);
} }
sde_rotator_return_all_buffers(q, VB2_BUF_STATE_ERROR); sde_rotator_return_all_buffers(q, VB2_BUF_STATE_ERROR);