[media] cx23885: incorrect I2C bus used in the CI registration
authorOlli Salonen <olli.salonen@iki.fi>
Tue, 23 Dec 2014 15:48:07 +0000 (13:48 -0200)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 3 Mar 2016 15:08:07 +0000 (12:08 -0300)
This patch fixes a bug that was introduced by the commit:

commit 2b0aac3011bc7a9db27791bed4978554263ef079
Author: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

    [media] cx23885: move CI/MAC registration to a separate function

Signed-off-by: Olli Salonen <olli.salonen@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/pci/cx23885/cx23885-dvb.c

index 31765aa04c74d36ebeec0b35a8ff4882a1d9260f..f041b6931ba8bc6a0e35ef3261656faefdc36312 100644 (file)
@@ -1139,7 +1139,7 @@ static int dvb_register_ci_mac(struct cx23885_tsport *port)
                u8 eeprom[256]; /* 24C02 i2c eeprom */
                struct sp2_config sp2_config;
                struct i2c_board_info info;
-               struct cx23885_i2c *i2c_bus2 = &dev->i2c_bus[1];
+               struct cx23885_i2c *i2c_bus = &dev->i2c_bus[0];
 
                /* attach CI */
                memset(&sp2_config, 0, sizeof(sp2_config));
@@ -1151,7 +1151,7 @@ static int dvb_register_ci_mac(struct cx23885_tsport *port)
                info.addr = 0x40;
                info.platform_data = &sp2_config;
                request_module(info.type);
-               client_ci = i2c_new_device(&i2c_bus2->i2c_adap, &info);
+               client_ci = i2c_new_device(&i2c_bus->i2c_adap, &info);
                if (client_ci == NULL || client_ci->dev.driver == NULL)
                        return -ENODEV;
                if (!try_module_get(client_ci->dev.driver->owner)) {