From: Laurent Pinchart Date: Thu, 22 Aug 2013 22:51:01 +0000 (-0300) Subject: [media] v4l: vsp1: Fix mutex double lock at streamon time X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=26a20eb09d44dc064c4f5d1f024bd501c09edb4b;p=openwrt%2Fstaging%2Fblogic.git [media] v4l: vsp1: Fix mutex double lock at streamon time A mutex_lock() was left when the driver was converted to use the vb2 ioctl helpers, resulting in a deadlock at streamon time. Fix it. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c index f51f84232e2f..714c53ef6c11 100644 --- a/drivers/media/platform/vsp1/vsp1_video.c +++ b/drivers/media/platform/vsp1/vsp1_video.c @@ -839,8 +839,6 @@ vsp1_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type) struct vsp1_pipeline *pipe; int ret; - mutex_lock(&video->lock); - if (video->queue.owner && video->queue.owner != file->private_data) return -EBUSY;