V4L/DVB (12276): Remove a useless check from dvb_dmx_swfilter_packet()
authorAndreas Oberritter <obi@linuxtv.org>
Tue, 14 Jul 2009 23:48:37 +0000 (20:48 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 12 Sep 2009 15:17:44 +0000 (12:17 -0300)
Values for 'pid' range from 0 to 0x1fff. Therefore 'feed->pid' can never
be equal to both 'pid' and 0x2000. This makes the continue statement have
no effect.

Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/dvb-core/dvb_demux.c

index cfe2768d24af58133ecd47ba8461e25aa062d12b..eef6d36166268f77883b2fb454eb6dcd698ca1fa 100644 (file)
@@ -425,13 +425,9 @@ no_dvb_demux_tscheck:
                if ((DVR_FEED(feed)) && (dvr_done++))
                        continue;
 
-               if (feed->pid == pid) {
+               if (feed->pid == pid)
                        dvb_dmx_swfilter_packet_type(feed, buf);
-                       if (DVR_FEED(feed))
-                               continue;
-               }
-
-               if (feed->pid == 0x2000)
+               else if (feed->pid == 0x2000)
                        feed->cb.ts(buf, 188, NULL, 0, &feed->feed.ts, DMX_OK);
        }
 }