Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8394bcf3 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent fb1f9020

drivers/media/video/gspca/ov519.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2248,7 +2248,7 @@ static int i2c_w(struct sd *sd, __u8 reg, __u8 value) 




static int i2c_r(struct sd *sd, __u8 reg)

static int i2c_r(struct sd *sd, __u8 reg)

{

{

	int ret;

	int ret = -1;





	if (sd->sensor_reg_cache[reg] != -1)

	if (sd->sensor_reg_cache[reg] != -1)

		return sd->sensor_reg_cache[reg];

		return sd->sensor_reg_cache[reg];

drivers/media/video/gspca/w996Xcf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -580,7 +580,7 @@ static void w9968cf_pkt_scan(struct gspca_dev *gspca_dev, 
	/* An empty packet signals EOF */

	/* An empty packet signals EOF */

	if (gspca_dev->empty_packet) {

	if (gspca_dev->empty_packet) {

		frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,

		frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,

				data, len);

					NULL, 0);

		gspca_frame_add(gspca_dev, FIRST_PACKET, frame,

		gspca_frame_add(gspca_dev, FIRST_PACKET, frame,

				NULL, 0);

				NULL, 0);

		gspca_dev->empty_packet = 0;

		gspca_dev->empty_packet = 0;