diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-30 08:18:52 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:06:19 -0400 |
commit | e3cfd447d01cf723ccda0ad6bfa2e85b73d3d747 (patch) | |
tree | 8fd50212aabd40320a41b6a55055fc808b544cd8 /drivers/media/video/davinci | |
parent | 4bf8b679029127fd84e9bfeb8710723a426e89ad (diff) |
V4L/DVB: videobuf: add ext_lock argument to the queue init functions (part 2)
Missed a few init functions on non-Intel platforms the first time :-(
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/davinci')
-rw-r--r-- | drivers/media/video/davinci/vpfe_capture.c | 2 | ||||
-rw-r--r-- | drivers/media/video/davinci/vpif_capture.c | 3 | ||||
-rw-r--r-- | drivers/media/video/davinci/vpif_display.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c index b39112517dfb..cd068de9fc20 100644 --- a/drivers/media/video/davinci/vpfe_capture.c +++ b/drivers/media/video/davinci/vpfe_capture.c | |||
@@ -1372,7 +1372,7 @@ static int vpfe_reqbufs(struct file *file, void *priv, | |||
1372 | req_buf->type, | 1372 | req_buf->type, |
1373 | vpfe_dev->fmt.fmt.pix.field, | 1373 | vpfe_dev->fmt.fmt.pix.field, |
1374 | sizeof(struct videobuf_buffer), | 1374 | sizeof(struct videobuf_buffer), |
1375 | fh); | 1375 | fh, NULL); |
1376 | 1376 | ||
1377 | fh->io_allowed = 1; | 1377 | fh->io_allowed = 1; |
1378 | vpfe_dev->io_usrs = 1; | 1378 | vpfe_dev->io_usrs = 1; |
diff --git a/drivers/media/video/davinci/vpif_capture.c b/drivers/media/video/davinci/vpif_capture.c index 730bd4cf5772..109ab8d0ce09 100644 --- a/drivers/media/video/davinci/vpif_capture.c +++ b/drivers/media/video/davinci/vpif_capture.c | |||
@@ -927,7 +927,8 @@ static int vpif_reqbufs(struct file *file, void *priv, | |||
927 | &common->irqlock, | 927 | &common->irqlock, |
928 | reqbuf->type, | 928 | reqbuf->type, |
929 | common->fmt.fmt.pix.field, | 929 | common->fmt.fmt.pix.field, |
930 | sizeof(struct videobuf_buffer), fh); | 930 | sizeof(struct videobuf_buffer), fh, |
931 | NULL); | ||
931 | 932 | ||
932 | /* Set io allowed member of file handle to TRUE */ | 933 | /* Set io allowed member of file handle to TRUE */ |
933 | fh->io_allowed[index] = 1; | 934 | fh->io_allowed[index] = 1; |
diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c index 912c27b75099..8894af24bdb2 100644 --- a/drivers/media/video/davinci/vpif_display.c +++ b/drivers/media/video/davinci/vpif_display.c | |||
@@ -853,7 +853,8 @@ static int vpif_reqbufs(struct file *file, void *priv, | |||
853 | &video_qops, NULL, | 853 | &video_qops, NULL, |
854 | &common->irqlock, | 854 | &common->irqlock, |
855 | reqbuf->type, field, | 855 | reqbuf->type, field, |
856 | sizeof(struct videobuf_buffer), fh); | 856 | sizeof(struct videobuf_buffer), fh, |
857 | NULL); | ||
857 | 858 | ||
858 | /* Set io allowed member of file handle to TRUE */ | 859 | /* Set io allowed member of file handle to TRUE */ |
859 | fh->io_allowed[index] = 1; | 860 | fh->io_allowed[index] = 1; |