diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-18 23:09:02 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-18 23:09:02 -0200 |
| commit | d74366bb186a234f9b01dc27bf166f3d9578287b (patch) | |
| tree | 144cec4c5be71cf74d060b4187dd28d2a165d631 /linux/drivers/media/video/cafe_ccic.c | |
| parent | 83d9de51345a21cef7ad6938c56d193634d7b9b1 (diff) | |
| parent | 3a9c26fb747e192984f4d89a8d5111261b6c9c3f (diff) | |
| download | mediapointer-dvb-s2-d74366bb186a234f9b01dc27bf166f3d9578287b.tar.gz mediapointer-dvb-s2-d74366bb186a234f9b01dc27bf166f3d9578287b.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cafe_ccic.c')
| -rw-r--r-- | linux/drivers/media/video/cafe_ccic.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cafe_ccic.c b/linux/drivers/media/video/cafe_ccic.c index a8d0cb910..b61a90e78 100644 --- a/linux/drivers/media/video/cafe_ccic.c +++ b/linux/drivers/media/video/cafe_ccic.c @@ -1028,7 +1028,7 @@ static ssize_t cafe_v4l_read(struct file *filp, char __user *buffer, size_t len, loff_t *pos) { struct cafe_camera *cam = filp->private_data; - int ret; + int ret = 0; /* * Perhaps we're in speculative read mode and already @@ -1257,8 +1257,6 @@ static int cafe_vidioc_reqbufs(struct file *filp, void *priv, if (cam->n_sbufs == 0) /* no luck at all - ret already set */ kfree(cam->sb_bufs); - else - ret = 0; req->count = cam->n_sbufs; /* In case of partial success */ out: |