fix up funky logic in dvb.
Signed-off-by Dave Jones <[email protected]>
drivers/media/dvb/dvb-core/dvb_demux.c renamed from drivers/media/dvb/dvb-core/dvb_demux.c~ +2 -2
@@ -473,7 +473,7 @@ void dvb_dmx_swfilter_204(struct dvb_dem 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_dem }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 )
Signature · 1 line
http://www.codemonkey.org.uk