summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb/it913x.c
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2011-12-11 17:09:46 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-12-30 17:22:36 -0200
commitf36472da3a6d62ee46ae773bbbf05ddb24cd970c (patch)
treebceca4694ec89f03ba49cf1c93f4df4cdacfa0d8 /drivers/media/dvb/dvb-usb/it913x.c
parenta7187c324ff5a879b5b0e6bb947664071c870803 (diff)
[media] it913x stop dual frontend attach in warm state with single devices
Stop dual frontend attach in warm state with single devices. Since this is a no reconnect device this occurs only after a warm system reboot. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/it913x.c')
-rw-r--r--drivers/media/dvb/dvb-usb/it913x.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/dvb/dvb-usb/it913x.c b/drivers/media/dvb/dvb-usb/it913x.c
index 627fb819122..ba3f11f6feb 100644
--- a/drivers/media/dvb/dvb-usb/it913x.c
+++ b/drivers/media/dvb/dvb-usb/it913x.c
@@ -473,9 +473,12 @@ static int it913x_identify_state(struct usb_device *udev,
else
props->adapter[0].fe[0].stream.u.bulk.buffersize =
TS_BUFFER_SIZE_PID;
- if (it913x_config.dual_mode)
+ if (it913x_config.dual_mode) {
props->adapter[1].fe[0].stream.u.bulk.buffersize =
props->adapter[0].fe[0].stream.u.bulk.buffersize;
+ props->num_adapters = 2;
+ } else
+ props->num_adapters = 1;
ret = ite_firmware_select(udev, props);
@@ -499,10 +502,8 @@ static int it913x_identify_state(struct usb_device *udev,
if (ret != 0)
ret = it913x_wr_reg(udev, DEV_0,
GPIOH1_O, 0x0);
- props->num_adapters = 2;
}
- } else
- props->num_adapters = 1;
+ }
reg = it913x_read_reg(udev, IO_MUX_POWER_CLK);