diff options
| author | Peter Rosin | 2017-07-31 15:38:52 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2017-08-09 17:03:13 +0200 |
| commit | 8e2803ffd64cc181917f911fe0b657421ee78d9c (patch) | |
| tree | 330bfebb336176775c76533f2ded6a7f10c040e1 /drivers/media/usb/cx231xx | |
| parent | media: staging: media: atomisp: constify video_subdev structures (diff) | |
| download | kernel-qcow2-linux-8e2803ffd64cc181917f911fe0b657421ee78d9c.tar.gz kernel-qcow2-linux-8e2803ffd64cc181917f911fe0b657421ee78d9c.tar.xz kernel-qcow2-linux-8e2803ffd64cc181917f911fe0b657421ee78d9c.zip | |
media: cx231xx: only unregister successfully registered i2c adapters
This prevents potentially scary debug messages from the i2c core.
Signed-off-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/usb/cx231xx')
| -rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-core.c | 3 | ||||
| -rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-i2c.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-core.c b/drivers/media/usb/cx231xx/cx231xx-core.c index 46646ecd2dbc..f372ad3917a8 100644 --- a/drivers/media/usb/cx231xx/cx231xx-core.c +++ b/drivers/media/usb/cx231xx/cx231xx-core.c @@ -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]); diff --git a/drivers/media/usb/cx231xx/cx231xx-i2c.c b/drivers/media/usb/cx231xx/cx231xx-i2c.c index 3e49517cb5e0..8ce6b815d16d 100644 --- a/drivers/media/usb/cx231xx/cx231xx-i2c.c +++ b/drivers/media/usb/cx231xx/cx231xx-i2c.c @@ -553,7 +553,8 @@ int cx231xx_i2c_register(struct cx231xx_i2c *bus) */ void cx231xx_i2c_unregister(struct cx231xx_i2c *bus) { - i2c_del_adapter(&bus->i2c_adap); + if (!bus->i2c_rc) + i2c_del_adapter(&bus->i2c_adap); } /* |