summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/zoran/zoran_driver.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-03 22:01:22 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-03 22:01:22 -0300
commite5e653212e9f537a69f88edaa1a7a2fe4e0dac52 (patch)
tree12a6d78944e39d86d0d1eb252ef57ea207ccc73a /linux/drivers/media/video/zoran/zoran_driver.c
parentef1ebf00be0fc71da604ae83054e10a99141adf7 (diff)
parentadacc8e7aa06a06a13dd78a533e0b2d02341887f (diff)
downloadmediapointer-dvb-s2-e5e653212e9f537a69f88edaa1a7a2fe4e0dac52.tar.gz
mediapointer-dvb-s2-e5e653212e9f537a69f88edaa1a7a2fe4e0dac52.tar.bz2
merge: http://udev.netup.ru/hg/v4l-dvb-netup
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/zoran/zoran_driver.c')
-rw-r--r--linux/drivers/media/video/zoran/zoran_driver.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/linux/drivers/media/video/zoran/zoran_driver.c b/linux/drivers/media/video/zoran/zoran_driver.c
index 7ddbdf37d..8eda83b06 100644
--- a/linux/drivers/media/video/zoran/zoran_driver.c
+++ b/linux/drivers/media/video/zoran/zoran_driver.c
@@ -2499,12 +2499,7 @@ static int zoran_querybuf(struct file *file, void *__fh, struct v4l2_buffer *buf
{
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
- __u32 type = buf->type;
- int index = buf->index, res;
-
- memset(buf, 0, sizeof(*buf));
- buf->type = type;
- buf->index = index;
+ int res;
mutex_lock(&zr->resource_lock);
res = zoran_v4l2_buffer_status(file, buf, buf->index);