platform/x86: i2c-multi-instantiate: Accept errors of i2c_acpi_new_device()

In the future i2c_acpi_new_device() will return error pointer in some cases.
Prepare i2c-multi-instantiate driver to support that.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/drivers/platform/x86/i2c-multi-instantiate.c b/drivers/platform/x86/i2c-multi-instantiate.c
index 5456581b473c9f417e07198799371033bb560159..e3345da82c842a917fc942bea1b56fe6f8f33588 100644 (file)
--- a/drivers/platform/x86/i2c-multi-instantiate.c
+++ b/drivers/platform/x86/i2c-multi-instantiate.c
@@ -72,9 +72,14 @@ static int i2c_multi_inst_probe(struct platform_device *pdev)
                        board_info.irq = ret;
                }
                multi->clients[i] = i2c_acpi_new_device(dev, i, &board_info);
-               if (!multi->clients[i]) {
-                       dev_err(dev, "Error creating i2c-client, idx %d\n", i);
+               if (IS_ERR(multi->clients[i]))
+                       ret = PTR_ERR(multi->clients[i]);
+               else if (!multi->clients[i])
                        ret = -ENODEV;
+               else
+                       ret = 0;
+               if (ret) {
+                       dev_err(dev, "Error creating i2c-client, idx %d\n", i);
                        goto error;
                }
        }