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

Commit ec675bce authored by Dave Jones's avatar Dave Jones Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (4149): Fix up funky logic in dvb 



Signed-off-by: default avatarDave Jones <davej@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent c18cb01c

drivers/media/dvb/dvb-core/dvb_demux.c

+2 −2
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ void dvb_dmx_swfilter_204(struct dvb_demux *demux, const u8 *buf, size_t count) 
			goto bailout;

		}

		memcpy(&demux->tsbuf[i], buf, j);

		if ((demux->tsbuf[0] == 0x47) | (demux->tsbuf[0] == 0xB8)) {

		if ((demux->tsbuf[0] == 0x47) || (demux->tsbuf[0] == 0xB8)) {

			memcpy(tmppack, demux->tsbuf, 188);

			if (tmppack[0] == 0xB8)

				tmppack[0] = 0x47;
@@ -484,7 +484,7 @@ void dvb_dmx_swfilter_204(struct dvb_demux *demux, const u8 *buf, size_t count) 
	}



	while (p < count) {

		if ((buf[p] == 0x47) | (buf[p] == 0xB8)) {

		if ((buf[p] == 0x47) || (buf[p] == 0xB8)) {

			if (count - p >= 204) {

				memcpy(tmppack, &buf[p], 188);

				if (tmppack[0] == 0xB8)