Messages in this thread Patch in this message | | | Date | Thu, 22 Jun 2006 20:37:13 -0400 | From | Dave Jones <> | Subject | fix up funky logic in dvb. |
| |
Signed-off-by: Dave Jones <davej@redhat.com>
--- linux-2.6/drivers/media/dvb/dvb-core/dvb_demux.c~ 2006-06-22 20:35:25.000000000 -0400 +++ linux-2.6/drivers/media/dvb/dvb-core/dvb_demux.c 2006-06-22 20:36:02.000000000 -0400 @@ -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) -- http://www.codemonkey.org.uk - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |