* fix up funky logic in dvb.
@ 2006-06-23 0:37 Dave Jones
0 siblings, 0 replies; only message in thread
From: Dave Jones @ 2006-06-23 0:37 UTC (permalink / raw)
To: Linux Kernel; +Cc: akpm
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2006-06-23 0:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-06-23 0:37 fix up funky logic in dvb Dave Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox