media: em28xx: explicitly disable TS packet filter

The em28xx driver never touched the EM2874 register bits that control
the transport stream packet filters, leaving them at whatever default
the firmware has set. E.g. the Pinnacle 290e disables them by default,
while the Hauppauge WinTV dualHD enables discarding NULL packets by
default.

However, some applications require NULL packets, e.g. to determine the
load in DOCSIS segments, so discarding NULL packets is undesired for
such applications.

This patch simply extends the bit mask when starting or stopping the
transport stream packet capture, so that the filter bits are cleared.
It has been verified that this makes the Hauppauge WinTV dualHD pass
an unfiltered DVB-C stream including NULL packets, which it didn't
before.

Signed-off-by: Robert Schlabbach <Robert.Schlabbach@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/usb/em28xx/em28xx-core.c b/drivers/media/usb/em28xx/em28xx-core.c
index f70845e7d8c60b06a049e6e8eb4854d307f0982e..45b24776a695cc511a60338c1c6c5dc3b714b149 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-core.c
+++ b/drivers/media/usb/em28xx/em28xx-core.c
@@ -655,12 +655,12 @@ int em28xx_capture_start(struct em28xx *dev, int start)
                        rc = em28xx_write_reg_bits(dev,
                                                   EM2874_R5F_TS_ENABLE,
                                                   start ? EM2874_TS1_CAPTURE_ENABLE : 0x00,
-                                                  EM2874_TS1_CAPTURE_ENABLE);
+                                                  EM2874_TS1_CAPTURE_ENABLE | EM2874_TS1_FILTER_ENABLE | EM2874_TS1_NULL_DISCARD);
                else
                        rc = em28xx_write_reg_bits(dev,
                                                   EM2874_R5F_TS_ENABLE,
                                                   start ? EM2874_TS2_CAPTURE_ENABLE : 0x00,
-                                                  EM2874_TS2_CAPTURE_ENABLE);
+                                                  EM2874_TS2_CAPTURE_ENABLE | EM2874_TS2_FILTER_ENABLE | EM2874_TS2_NULL_DISCARD);
        } else {
                /* FIXME: which is the best order? */
                /* video registers are sampled by VREF */