drm/udl: Store active framebuffer in device structure

[linux.git] / drivers / mfd / bcm590xx.c

diff --git a/drivers/mfd/bcm590xx.c b/drivers/mfd/bcm590xx.c
index 1aeb5e498d914eca62830ea3528528362f367c56..bfac5dc091caabfa5509b76e1cb43bae21436ad4 100644 (file)
--- a/drivers/mfd/bcm590xx.c
+++ b/drivers/mfd/bcm590xx.c
@@ -61,11 +61,11 @@ static int bcm590xx_i2c_probe(struct i2c_client *i2c_pri,
        }
 
        /* Secondary I2C slave address is the base address with A(2) asserted */
-       bcm590xx->i2c_sec = i2c_new_dummy(i2c_pri->adapter,
+       bcm590xx->i2c_sec = i2c_new_dummy_device(i2c_pri->adapter,
                                          i2c_pri->addr | BIT(2));
-       if (!bcm590xx->i2c_sec) {
+       if (IS_ERR(bcm590xx->i2c_sec)) {
                dev_err(&i2c_pri->dev, "failed to add secondary I2C device\n");
-               return -ENODEV;
+               return PTR_ERR(bcm590xx->i2c_sec);
        }
        i2c_set_clientdata(bcm590xx->i2c_sec, bcm590xx);