summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/dvb-usb-v2
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2013-03-07 18:43:51 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-21 19:01:14 -0300
commitab56ad6ada8c7ff56a4f4b032e79471cb1c3c0fc (patch)
treefd013618ede3a26c37bb5d1a41f5aa91379ca4c1 /drivers/media/usb/dvb-usb-v2
parent431a6d4ab9cfc41dd541544f8afdd517090e49b1 (diff)
downloadlinux-stable-ab56ad6ada8c7ff56a4f4b032e79471cb1c3c0fc.tar.gz
linux-stable-ab56ad6ada8c7ff56a4f4b032e79471cb1c3c0fc.tar.bz2
linux-stable-ab56ad6ada8c7ff56a4f4b032e79471cb1c3c0fc.zip
[media] af9035: set demod TS mode config in read_config()
Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/dvb-usb-v2')
-rw-r--r--drivers/media/usb/dvb-usb-v2/af9035.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index 1ccc9ce02d8c..3efb79af4d9b 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -588,6 +588,8 @@ static int af9035_read_config(struct dvb_usb_device *d)
state->af9033_config[0].i2c_addr = 0x38;
state->af9033_config[0].adc_multiplier = AF9033_ADC_MULTIPLIER_2X;
state->af9033_config[1].adc_multiplier = AF9033_ADC_MULTIPLIER_2X;
+ state->af9033_config[0].ts_mode = AF9033_TS_MODE_USB;
+ state->af9033_config[1].ts_mode = AF9033_TS_MODE_SERIAL;
/* eeprom memory mapped location */
if (state->chip_type == 0x9135) {
@@ -903,11 +905,6 @@ static int af9035_frontend_attach(struct dvb_usb_adapter *adap)
goto err;
}
- if (adap->id == 0) {
- state->af9033_config[0].ts_mode = AF9033_TS_MODE_USB;
- state->af9033_config[1].ts_mode = AF9033_TS_MODE_SERIAL;
- }
-
/* attach demodulator */
adap->fe[0] = dvb_attach(af9033_attach, &state->af9033_config[adap->id],
&d->i2c_adap);