Merge tag 'for-linus-20191003' of git://git.kernel.org/pub/scm/linux/kernel/git/braun...

[linux-2.6-microblaze.git] / drivers / mfd / da9150-core.c

diff --git a/drivers/mfd/da9150-core.c b/drivers/mfd/da9150-core.c
index 1303306..7f0aa1e 100644 (file)
--- a/drivers/mfd/da9150-core.c
+++ b/drivers/mfd/da9150-core.c
@@ -420,10 +420,10 @@ static int da9150_probe(struct i2c_client *client,
        qif_addr = da9150_reg_read(da9150, DA9150_CORE2WIRE_CTRL_A);
        qif_addr = (qif_addr & DA9150_CORE_BASE_ADDR_MASK) >> 1;
        qif_addr |= DA9150_QIF_I2C_ADDR_LSB;
-       da9150->core_qif = i2c_new_dummy(client->adapter, qif_addr);
-       if (!da9150->core_qif) {
+       da9150->core_qif = i2c_new_dummy_device(client->adapter, qif_addr);
+       if (IS_ERR(da9150->core_qif)) {
                dev_err(da9150->dev, "Failed to attach QIF client\n");
-               return -ENODEV;
+               return PTR_ERR(da9150->core_qif);
        }
 
        i2c_set_clientdata(da9150->core_qif, da9150);