aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2006-06-23 08:01:42 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 01:05:13 -0400
commitec675bce403b46570e6ab93eb9a226e966de1010 (patch)
tree498e551ea95e5300b76d2e23dd866bbb78e4c49b /drivers
parentc18cb01ca139716a39f4fb92286b6096e8b3f968 (diff)
V4L/DVB (4149): Fix up funky logic in dvb
Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb/dvb-core/dvb_demux.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-core/dvb_demux.c b/drivers/media/dvb/dvb-core/dvb_demux.c
index 83ec5e06c482..fcff5eab21a3 100644
--- a/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/drivers/media/dvb/dvb-core/dvb_demux.c
@@ -473,7 +473,7 @@ void dvb_dmx_swfilter_204(struct dvb_demux *demux, const u8 *buf, size_t count)
473 goto bailout; 473 goto bailout;
474 } 474 }
475 memcpy(&demux->tsbuf[i], buf, j); 475 memcpy(&demux->tsbuf[i], buf, j);
476 if ((demux->tsbuf[0] == 0x47) | (demux->tsbuf[0] == 0xB8)) { 476 if ((demux->tsbuf[0] == 0x47) || (demux->tsbuf[0] == 0xB8)) {
477 memcpy(tmppack, demux->tsbuf, 188); 477 memcpy(tmppack, demux->tsbuf, 188);
478 if (tmppack[0] == 0xB8) 478 if (tmppack[0] == 0xB8)
479 tmppack[0] = 0x47; 479 tmppack[0] = 0x47;
@@ -484,7 +484,7 @@ void dvb_dmx_swfilter_204(struct dvb_demux *demux, const u8 *buf, size_t count)
484 } 484 }
485 485
486 while (p < count) { 486 while (p < count) {
487 if ((buf[p] == 0x47) | (buf[p] == 0xB8)) { 487 if ((buf[p] == 0x47) || (buf[p] == 0xB8)) {
488 if (count - p >= 204) { 488 if (count - p >= 204) {
489 memcpy(tmppack, &buf[p], 188); 489 memcpy(tmppack, &buf[p], 188);
490 if (tmppack[0] == 0xB8) 490 if (tmppack[0] == 0xB8)