diff --git a/[refs] b/[refs] index ea105ebbae6a..17fc33213cb4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 150a1363680b93703883a0d193756d620666031a +refs/heads/master: c2c9036545dd0b8b782554cc9c001288c0a7d5a6 diff --git a/trunk/drivers/media/dvb-core/dvb_demux.c b/trunk/drivers/media/dvb-core/dvb_demux.c index 17cb81fd194c..d319717eb535 100644 --- a/trunk/drivers/media/dvb-core/dvb_demux.c +++ b/trunk/drivers/media/dvb-core/dvb_demux.c @@ -424,12 +424,12 @@ static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf) printk(KERN_INFO "TS speed %llu Kbits/sec \n", div64_u64(speed_bytes, speed_timedelta)); - }; + } demux->speed_last_time = cur_time; demux->speed_pkts_cnt = 0; - }; - }; + } + } if (buf[1] & 0x80) { dprintk_tscheck("TEI detected. " @@ -451,9 +451,9 @@ static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf) buf[3] & 0xf); demux->cnt_storage[pid] = ((buf[3] & 0xf) + 1)&0xf; - }; + } /* end check */ - }; + } list_for_each_entry(feed, &demux->feed_list, list_head) { if ((feed->pid != pid) && (feed->pid != 0x2000))