V4L/DVB: videobuf: add queue argument to videobuf_waiton()

videobuf_waiton() must unlock and relock ext_lock if it has to wait.
For that to happen it needs the videobuf_queue pointer.

Don't attempt to unlock/relock q->ext_lock unless it was locked in the
first place.

vb->state has to be protected by a spinlock to be safe.

This patch is based on code from Mauro Carvalho Chehab <mchehab@redhat.com>.

[mchehab@redhat.com: add extra argument to a few missing places]
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/video/tlg2300/pd-video.c b/drivers/media/video/tlg2300/pd-video.c
index d0cc012f7ae6..a1ffe18640fe 100644
--- a/drivers/media/video/tlg2300/pd-video.c
+++ b/drivers/media/video/tlg2300/pd-video.c
@@ -1434,7 +1434,7 @@ static int pd_video_open(struct file *file)
                                 V4L2_BUF_TYPE_VIDEO_CAPTURE,
                                 V4L2_FIELD_INTERLACED,/* video is interlacd */
                                 sizeof(struct videobuf_buffer),/*it's enough*/
-                                front);
+                                front, NULL);
         } else if (vfd->vfl_type == VFL_TYPE_VBI
                 && !(pd->state & POSEIDON_STATE_VBI)) {
                 front = kzalloc(sizeof(struct front_face), GFP_KERNEL);
@@ -1451,7 +1451,7 @@ static int pd_video_open(struct file *file)
                                 V4L2_BUF_TYPE_VBI_CAPTURE,
                                 V4L2_FIELD_NONE, /* vbi is NONE mode */
                                 sizeof(struct videobuf_buffer),
-                                front);
+                                front, NULL);
         } else {
                 /* maybe add FM support here */
                 log("other ");