aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2013-08-22 19:51:01 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-08-28 05:40:07 -0300
commit26a20eb09d44dc064c4f5d1f024bd501c09edb4b (patch)
treef3392a9c500a4ed6b1c7876f62c92a3f5d2978e5
parentf2226a33bf9a431f616b435aa10a9ad4fea1d042 (diff)
[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 <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/platform/vsp1/vsp1_video.c2
1 files changed, 0 insertions, 2 deletions
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;

Privacy Policy