[media] cx231xx_dvb: use demod_i2c for demod attach

Tested:
* CX231XX_BOARD_HAUPPAUGE_930C_HD_1113xx
* CX231XX_BOARD_HAUPPAUGE_930C_HD_1114xx

Not Tested:
* CX231XX_BOARD_HAUPPAUGE_EXETER
* CX231XX_BOARD_HAUPPAUGE_955Q

Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
index be018fc089de88f300d919380fae8ab9769ac98d..89dc695c696e5b154b6543f2b85c83459b13a622 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -352,7 +352,7 @@ struct cx231xx_board cx231xx_boards[] = {
                .agc_analog_digital_select_gpio = 0x0c,
                .gpio_pin_status_mask = 0x4001000,
                .tuner_i2c_master = I2C_1_MUX_1,
-               .demod_i2c_master = I2C_2,
+               .demod_i2c_master = I2C_1_MUX_1,
                .has_dvb = 1,
                .demod_addr = 0x0e,
                .norm = V4L2_STD_NTSC,
@@ -713,7 +713,7 @@ struct cx231xx_board cx231xx_boards[] = {
                .agc_analog_digital_select_gpio = 0x0c,
                .gpio_pin_status_mask = 0x4001000,
                .tuner_i2c_master = I2C_1_MUX_3,
-               .demod_i2c_master = I2C_2,
+               .demod_i2c_master = I2C_1_MUX_3,
                .has_dvb = 1,
                .demod_addr = 0x0e,
                .norm = V4L2_STD_PAL,
@@ -752,7 +752,7 @@ struct cx231xx_board cx231xx_boards[] = {
                .agc_analog_digital_select_gpio = 0x0c,
                .gpio_pin_status_mask = 0x4001000,
                .tuner_i2c_master = I2C_1_MUX_3,
-               .demod_i2c_master = I2C_2,
+               .demod_i2c_master = I2C_1_MUX_3,
                .has_dvb = 1,
                .demod_addr = 0x0e,
                .norm = V4L2_STD_PAL,
@@ -791,7 +791,7 @@ struct cx231xx_board cx231xx_boards[] = {
                .agc_analog_digital_select_gpio = 0x0c,
                .gpio_pin_status_mask = 0x4001000,
                .tuner_i2c_master = I2C_1_MUX_3,
-               .demod_i2c_master = I2C_2,
+               .demod_i2c_master = I2C_1_MUX_3,
                .has_dvb = 1,
                .demod_addr = 0x0e,
                .norm = V4L2_STD_NTSC,

diff --git a/drivers/media/usb/cx231xx/cx231xx-dvb.c b/drivers/media/usb/cx231xx/cx231xx-dvb.c
index 66ee161fc7ba891a14bdace5f79b4a155d993ded..e3594b9fab4a58247630a5b5d37af4eb8363b3db 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-dvb.c
+++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c
@@ -725,7 +725,7 @@ static int dvb_init(struct cx231xx *dev)
 
                dev->dvb->frontend = dvb_attach(lgdt3305_attach,
                                                &hcw_lgdt3305_config,
-                                               tuner_i2c);
+                                               demod_i2c);
 
                if (dev->dvb->frontend == NULL) {
                        dev_err(dev->dev,
@@ -746,7 +746,7 @@ static int dvb_init(struct cx231xx *dev)
 
                dev->dvb->frontend = dvb_attach(si2165_attach,
                        &hauppauge_930C_HD_1113xx_si2165_config,
-                       tuner_i2c
+                       demod_i2c
                        );
 
                if (dev->dvb->frontend == NULL) {
@@ -779,7 +779,7 @@ static int dvb_init(struct cx231xx *dev)
 
                dev->dvb->frontend = dvb_attach(si2165_attach,
                        &pctv_quatro_stick_1114xx_si2165_config,
-                       tuner_i2c
+                       demod_i2c
                        );
 
                if (dev->dvb->frontend == NULL) {
@@ -835,7 +835,7 @@ static int dvb_init(struct cx231xx *dev)
 
                dev->dvb->frontend = dvb_attach(lgdt3306a_attach,
                        &hauppauge_955q_lgdt3306a_config,
-                       tuner_i2c
+                       demod_i2c
                        );
 
                if (dev->dvb->frontend == NULL) {