| From 067a19bb32538fee8e59fb37b9bb687a8f7ec94e Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Thu, 22 Aug 2013 19:51:01 -0300 |
| Subject: [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> |
| (cherry picked from commit 26a20eb09d44dc064c4f5d1f024bd501c09edb4b) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/media/platform/vsp1/vsp1_video.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c |
| index 279332e34710..76718a9ea34f 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; |
| |
| -- |
| 1.8.5.rc3 |
| |
