Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37a35ced authored by Olli Salonen's avatar Olli Salonen Committed by Mauro Carvalho Chehab
Browse files

[media] cx23885: fix reversed I2C bus numbering 



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: default avatarOlli Salonen <olli.salonen@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent f3c6abca

drivers/media/pci/cx23885/cx23885-dvb.c

+6 −6
Original line number Diff line number Diff line
@@ -1988,8 +1988,8 @@ static int dvb_register(struct cx23885_tsport *port) 
		break;

	case CX23885_BOARD_DVBSKY_T980C:

	case CX23885_BOARD_TT_CT2_4500_CI:

		i2c_bus = &dev->i2c_bus[1];

		i2c_bus2 = &dev->i2c_bus[0];

		i2c_bus = &dev->i2c_bus[0];

		i2c_bus2 = &dev->i2c_bus[1];



		/* attach frontend */

		memset(&si2168_config, 0, sizeof(si2168_config));
@@ -2001,7 +2001,7 @@ static int dvb_register(struct cx23885_tsport *port) 
		info.addr = 0x64;

		info.platform_data = &si2168_config;

		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)

			goto frontend_detach;

		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;

		break;

	case CX23885_BOARD_DVBSKY_S950C:

		i2c_bus = &dev->i2c_bus[1];

		i2c_bus2 = &dev->i2c_bus[0];

		i2c_bus = &dev->i2c_bus[0];

		i2c_bus2 = &dev->i2c_bus[1];



		/* attach frontend */

		fe0->dvb.frontend = dvb_attach(m88ds3103_attach,

				&dvbsky_s950c_m88ds3103_config,

				&i2c_bus->i2c_adap, &adapter);

				&i2c_bus2->i2c_adap, &adapter);

		if (fe0->dvb.frontend == NULL)

			break;