iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] cx23885: incorrect I2C bus used in the CI registration

Browse Source 
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>
This commit is contained in:
Olli Salonen 2014-12-23 13:48:07 -02:00 committed by Mauro Carvalho Chehab
parent a40973ff10
commit ab8b5e49f7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/pci/cx23885/cx23885-dvb.c
View File

@ -1139,7 +1139,7 @@ static int dvb_register_ci_mac(struct cx23885_tsport *port)
u8 eeprom[256]; /* 24C02 i2c eeprom */ u8 eeprom[256]; /* 24C02 i2c eeprom */
struct sp2_config sp2_config; struct sp2_config sp2_config;
struct i2c_board_info info; 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 */ /* attach CI */
memset(&sp2_config, 0, sizeof(sp2_config)); 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.addr = 0x40;
info.platform_data = &sp2_config; info.platform_data = &sp2_config;
request_module(info.type); 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) if (client_ci == NULL || client_ci->dev.driver == NULL)
return -ENODEV; return -ENODEV;
if (!try_module_get(client_ci->dev.driver->owner)) { if (!try_module_get(client_ci->dev.driver->owner)) {