aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/zoran
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2009-03-03 18:44:45 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:04 -0400
commit9cfb6a3f1b16e82fab97831265858aa2d1983883 (patch)
treee5b25c018495f3b7361af9dfdfb3ec588696ac26 /drivers/media/video/zoran
parent86b5aeacabb4451655c528c41d45ca05b753f72c (diff)
V4L/DVB (10794): v4l2: Move code to zero querybuf output struct to v4l2_ioctl
For VIDIOC_QUERYBUF only the first two fields, size and type, are used as input. The rest can be filled in by the driver as output. Most drivers do not actually use all the field and unused ones should be zeroed out. Some drivers have code to do this and some drivers should but don't. So put some zero out code in v4l2_ioctl so that all drivers using that system get it. The drivers that have zeroing code get that code removed. Some drivers checked that the type field was valid, but v4l2_ioctl already does this so those checks can be removed as well. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/zoran')
-rw-r--r--drivers/media/video/zoran/zoran_driver.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index daad93728cf9..5dcd56c9b947 100644
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -2498,12 +2498,7 @@ static int zoran_querybuf(struct file *file, void *__fh, struct v4l2_buffer *buf
2498{ 2498{
2499 struct zoran_fh *fh = __fh; 2499 struct zoran_fh *fh = __fh;
2500 struct zoran *zr = fh->zr; 2500 struct zoran *zr = fh->zr;
2501 __u32 type = buf->type; 2501 int res;
2502 int index = buf->index, res;
2503
2504 memset(buf, 0, sizeof(*buf));
2505 buf->type = type;
2506 buf->index = index;
2507 2502
2508 mutex_lock(&zr->resource_lock); 2503 mutex_lock(&zr->resource_lock);
2509 res = zoran_v4l2_buffer_status(file, buf, buf->index); 2504 res = zoran_v4l2_buffer_status(file, buf, buf->index);