Commit a7853c25 authored by Brad Love's avatar Brad Love Committed by Mauro Carvalho Chehab

media: em28xx: Fix dual transport stream operation

Addresses the following, which introduced a regression itself:

Commit 509f8965 ("media: em28xx: fix a regression with HVR-950")

The regression fix breaks dual transport stream support. Currently,
when a tuner starts streaming it sets alt mode on the USB interface.
The problem is, in a dual tuner model, both tuners share the same
USB interface, so when the second tuner becomes active and sets alt
mode on the interface it kills streaming on the other port.

This patch addresses the regression by only setting alt mode
on the USB interface during em28xx_start_streaming, if the
device is not a dual tuner model. This allows all older and
single tuner devices to explicitly set alt mode during stream
startup. Testers report both isoc and bulk DualHD models work
correctly with the alt mode set only once, in em28xx_dvb_init.

Fixes: 509f8965 ("media: em28xx: fix a regression with HVR-950")
Signed-off-by: default avatarBrad Love <brad@nextdimension.cc>
Signed-off-by: default avatarMichael Ira Krufky <mkrufky@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 64004337
...@@ -218,7 +218,9 @@ static int em28xx_start_streaming(struct em28xx_dvb *dvb) ...@@ -218,7 +218,9 @@ static int em28xx_start_streaming(struct em28xx_dvb *dvb)
dvb_alt = dev->dvb_alt_isoc; dvb_alt = dev->dvb_alt_isoc;
} }
usb_set_interface(udev, dev->ifnum, dvb_alt); if (!dev->board.has_dual_ts)
usb_set_interface(udev, dev->ifnum, dvb_alt);
rc = em28xx_set_mode(dev, EM28XX_DIGITAL_MODE); rc = em28xx_set_mode(dev, EM28XX_DIGITAL_MODE);
if (rc < 0) if (rc < 0)
return rc; return rc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment