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

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

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



This patch fixes a bug that was introduced by the commit:

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

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

Signed-off-by: default avatarOlli Salonen <olli.salonen@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent a40973ff

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -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)) {