drm/i915: Favor last VBT child device with conflicting AUX ch/DDC pin

[linux.git] / drivers / mfd / twl-core.c

diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 448d9397ff04b5006ec6ad4b549738221c037884..20cf8cfe4f3b5ad30b89c91e24d718802b4ad091 100644 (file)
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -1141,12 +1141,12 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
                if (i == 0) {
                        twl->client = client;
                } else {
-                       twl->client = i2c_new_dummy(client->adapter,
+                       twl->client = i2c_new_dummy_device(client->adapter,
                                                    client->addr + i);
-                       if (!twl->client) {
+                       if (IS_ERR(twl->client)) {
                                dev_err(&client->dev,
                                        "can't attach client %d\n", i);
-                               status = -ENOMEM;
+                               status = PTR_ERR(twl->client);
                                goto fail;
                        }
                }