diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2009-10-16 11:26:22 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-05 18:40:45 -0200 |
| commit | 8394bcf3fc0293aa5cd07e2a1a3c6bf4e1a5b835 (patch) | |
| tree | b7fa8410b2db4a9db5107ae2dc3f01d64d3c5b45 /drivers | |
| parent | fb1f9020609ead93fcec4b0dd02511a46294c147 (diff) | |
| download | linux-stable-8394bcf3fc0293aa5cd07e2a1a3c6bf4e1a5b835.tar.gz linux-stable-8394bcf3fc0293aa5cd07e2a1a3c6bf4e1a5b835.tar.bz2 linux-stable-8394bcf3fc0293aa5cd07e2a1a3c6bf4e1a5b835.zip | |
V4L/DVB (13180): gspca-w9968cf: Don't add an extra packet to the buffer after the EOF
gspca-w9968cf: Don't add an extra packet to the buffer after the EOF,
this makes the frame data size bigger then it should be which makes
gstreamer discard it.
This patch also fixes an unrelated compiler warning.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/gspca/ov519.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/gspca/w996Xcf.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c index 91e9b23a3a01..ef88e244df17 100644 --- a/drivers/media/video/gspca/ov519.c +++ b/drivers/media/video/gspca/ov519.c @@ -2248,7 +2248,7 @@ static int i2c_w(struct sd *sd, __u8 reg, __u8 value) static int i2c_r(struct sd *sd, __u8 reg) { - int ret; + int ret = -1; if (sd->sensor_reg_cache[reg] != -1) return sd->sensor_reg_cache[reg]; diff --git a/drivers/media/video/gspca/w996Xcf.c b/drivers/media/video/gspca/w996Xcf.c index ba3a28d4f87f..3bdc6b405e27 100644 --- a/drivers/media/video/gspca/w996Xcf.c +++ b/drivers/media/video/gspca/w996Xcf.c @@ -580,7 +580,7 @@ static void w9968cf_pkt_scan(struct gspca_dev *gspca_dev, /* An empty packet signals EOF */ if (gspca_dev->empty_packet) { frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame, - data, len); + NULL, 0); gspca_frame_add(gspca_dev, FIRST_PACKET, frame, NULL, 0); gspca_dev->empty_packet = 0; |