aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2013-03-07 16:43:51 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-21 18:01:14 -0400
commitab56ad6ada8c7ff56a4f4b032e79471cb1c3c0fc (patch)
treefd013618ede3a26c37bb5d1a41f5aa91379ca4c1
parent431a6d4ab9cfc41dd541544f8afdd517090e49b1 (diff)
[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>
-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)
588 state->af9033_config[0].i2c_addr = 0x38; 588 state->af9033_config[0].i2c_addr = 0x38;
589 state->af9033_config[0].adc_multiplier = AF9033_ADC_MULTIPLIER_2X; 589 state->af9033_config[0].adc_multiplier = AF9033_ADC_MULTIPLIER_2X;
590 state->af9033_config[1].adc_multiplier = AF9033_ADC_MULTIPLIER_2X; 590 state->af9033_config[1].adc_multiplier = AF9033_ADC_MULTIPLIER_2X;
591 state->af9033_config[0].ts_mode = AF9033_TS_MODE_USB;
592 state->af9033_config[1].ts_mode = AF9033_TS_MODE_SERIAL;
591 593
592 /* eeprom memory mapped location */ 594 /* eeprom memory mapped location */
593 if (state->chip_type == 0x9135) { 595 if (state->chip_type == 0x9135) {
@@ -903,11 +905,6 @@ static int af9035_frontend_attach(struct dvb_usb_adapter *adap)
903 goto err; 905 goto err;
904 } 906 }
905 907
906 if (adap->id == 0) {
907 state->af9033_config[0].ts_mode = AF9033_TS_MODE_USB;
908 state->af9033_config[1].ts_mode = AF9033_TS_MODE_SERIAL;
909 }
910
911 /* attach demodulator */ 908 /* attach demodulator */
912 adap->fe[0] = dvb_attach(af9033_attach, &state->af9033_config[adap->id], 909 adap->fe[0] = dvb_attach(af9033_attach, &state->af9033_config[adap->id],
913 &d->i2c_adap); 910 &d->i2c_adap);