diff options
| author |   Olli Salonen <olli.salonen@iki.fi> | 2014-12-23 13:48:07 -0200 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-03-03 12:08:07 -0300 |
| commit | ab8b5e49f742efbeb59471fa0f19361a7afe1922 (patch) | |
| tree | 470a8c62429f0b3ae46044718945107f34f212aa /drivers/media/pci | |
| parent | [media] igorplugusb: fix leaks in error path (diff) | |
| download | linux-dev-ab8b5e49f742efbeb59471fa0f19361a7afe1922.tar.xz linux-dev-ab8b5e49f742efbeb59471fa0f19361a7afe1922.zip | |
[media] cx23885: incorrect I2C bus used in the CI registration
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>
Diffstat (limited to 'drivers/media/pci')
| -rw-r--r-- | drivers/media/pci/cx23885/cx23885-dvb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c index 31765aa04c74..f041b6931ba8 100644 --- a/drivers/media/pci/cx23885/cx23885-dvb.c +++ b/drivers/media/pci/cx23885/cx23885-dvb.c @@ -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)) { |