Commit 8e2803ff authored by Peter Rosin's avatar Peter Rosin Committed by Mauro Carvalho Chehab
Browse files

media: cx231xx: only unregister successfully registered i2c adapters 



This prevents potentially scary debug messages from the i2c core.

Signed-off-by: default avatarPeter Rosin <peda@axentia.se>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 65058214

drivers/media/usb/cx231xx/cx231xx-core.c

+3 −0
Original line number Diff line number Diff line
@@ -1311,6 +1311,7 @@ int cx231xx_dev_init(struct cx231xx *dev) 
	dev->i2c_bus[0].i2c_period = I2C_SPEED_100K;	/* 100 KHz */

	dev->i2c_bus[0].i2c_nostop = 0;

	dev->i2c_bus[0].i2c_reserve = 0;

	dev->i2c_bus[0].i2c_rc = -ENODEV;



	/* External Master 2 Bus */

	dev->i2c_bus[1].nr = 1;
@@ -1318,6 +1319,7 @@ int cx231xx_dev_init(struct cx231xx *dev) 
	dev->i2c_bus[1].i2c_period = I2C_SPEED_100K;	/* 100 KHz */

	dev->i2c_bus[1].i2c_nostop = 0;

	dev->i2c_bus[1].i2c_reserve = 0;

	dev->i2c_bus[1].i2c_rc = -ENODEV;



	/* Internal Master 3 Bus */

	dev->i2c_bus[2].nr = 2;
@@ -1325,6 +1327,7 @@ int cx231xx_dev_init(struct cx231xx *dev) 
	dev->i2c_bus[2].i2c_period = I2C_SPEED_100K;	/* 100kHz */

	dev->i2c_bus[2].i2c_nostop = 0;

	dev->i2c_bus[2].i2c_reserve = 0;

	dev->i2c_bus[2].i2c_rc = -ENODEV;



	/* register I2C buses */

	errCode = cx231xx_i2c_register(&dev->i2c_bus[0]);

drivers/media/usb/cx231xx/cx231xx-i2c.c

+2 −1
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ int cx231xx_i2c_register(struct cx231xx_i2c *bus) 
 */

void cx231xx_i2c_unregister(struct cx231xx_i2c *bus)

{

	if (!bus->i2c_rc)

		i2c_del_adapter(&bus->i2c_adap);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE