media: cx231xx: fail probe if i2c_add_adapter fails

While at it, change the type of the previously always-zero i2c_rc
member to int, matching the returned type from i2c_add_adapter.

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>

diff --git a/drivers/media/usb/cx231xx/cx231xx-i2c.c b/drivers/media/usb/cx231xx/cx231xx-i2c.c
index 8d95b1154e12518e31e4d63cbecc3b1ce12f91b7..3a0c45ffd40fb995658da5389c1071bd22f2850f 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-i2c.c
+++ b/drivers/media/usb/cx231xx/cx231xx-i2c.c
@@ -538,7 +538,7 @@ int cx231xx_i2c_register(struct cx231xx_i2c *bus)
 
        bus->i2c_adap.algo_data = bus;
        i2c_set_adapdata(&bus->i2c_adap, &dev->v4l2_dev);
-       i2c_add_adapter(&bus->i2c_adap);
+       bus->i2c_rc = i2c_add_adapter(&bus->i2c_adap);
 
        if (0 != bus->i2c_rc)
                dev_warn(dev->dev,

diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h
index 986c64ba5b56085a840e24bbe357532038253987..27ee035f9f84a65aa0f72ff77d588365e85b6071 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx.h
+++ b/drivers/media/usb/cx231xx/cx231xx.h
@@ -476,7 +476,7 @@ struct cx231xx_i2c {
 
        /* i2c i/o */
        struct i2c_adapter i2c_adap;
-       u32 i2c_rc;
+       int i2c_rc;
 
        /* different settings for each bus */
        u8 i2c_period;