korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-19 18:24:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

[media] cx23885: fix reversed I2C bus numbering

Browse Source 
I2C buses for DVBSky T980C and S950C were numbered in an opposite
way compared to every other board in the driver. Switch numbering
to a more logical way.

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 2016-02-16 18:17:45 -02:00 committed by Mauro Carvalho Chehab
parent f3c6abcab5
commit 37a35ced62
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1988,8 +1988,8 @@ static int dvb_register(struct cx23885_tsport *port)
break; break;
case CX23885_BOARD_DVBSKY_T980C: case CX23885_BOARD_DVBSKY_T980C:
case CX23885_BOARD_TT_CT2_4500_CI: case CX23885_BOARD_TT_CT2_4500_CI:
i2c_bus = &dev->i2c_bus[1]; i2c_bus = &dev->i2c_bus[0];
i2c_bus2 = &dev->i2c_bus[0]; i2c_bus2 = &dev->i2c_bus[1];
/* attach frontend */ /* attach frontend */
memset(&si2168_config, 0, sizeof(si2168_config)); memset(&si2168_config, 0, sizeof(si2168_config));
@ -2001,7 +2001,7 @@ static int dvb_register(struct cx23885_tsport *port)
info.addr = 0x64; info.addr = 0x64;
info.platform_data = &si2168_config; info.platform_data = &si2168_config;
request_module(info.type); request_module(info.type);
client_demod = i2c_new_device(&i2c_bus->i2c_adap, &info); client_demod = i2c_new_device(&i2c_bus2->i2c_adap, &info);
if (client_demod == NULL || client_demod->dev.driver == NULL) if (client_demod == NULL || client_demod->dev.driver == NULL)
goto frontend_detach; goto frontend_detach;
if (!try_module_get(client_demod->dev.driver->owner)) { if (!try_module_get(client_demod->dev.driver->owner)) {
@ -2030,13 +2030,13 @@ static int dvb_register(struct cx23885_tsport *port)
port->i2c_client_tuner = client_tuner; port->i2c_client_tuner = client_tuner;
break; break;
case CX23885_BOARD_DVBSKY_S950C: case CX23885_BOARD_DVBSKY_S950C:
i2c_bus = &dev->i2c_bus[1]; i2c_bus = &dev->i2c_bus[0];
i2c_bus2 = &dev->i2c_bus[0]; i2c_bus2 = &dev->i2c_bus[1];
/* attach frontend */ /* attach frontend */
fe0->dvb.frontend = dvb_attach(m88ds3103_attach, fe0->dvb.frontend = dvb_attach(m88ds3103_attach,
&dvbsky_s950c_m88ds3103_config, &dvbsky_s950c_m88ds3103_config,
&i2c_bus->i2c_adap, &adapter); &i2c_bus2->i2c_adap, &adapter);
if (fe0->dvb.frontend == NULL) if (fe0->dvb.frontend == NULL)
break; break;