]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
i2c: i2c-mux-gpio: don't ignore of_get_named_gpio errors
authorIonut Nicu <ioan.nicu.ext@nsn.com>
Tue, 8 Oct 2013 13:51:53 +0000 (15:51 +0200)
committerWolfram Sang <wsa@the-dreams.de>
Thu, 10 Oct 2013 08:22:32 +0000 (10:22 +0200)
of_get_named_gpio could return -E_PROBE_DEFER or another
error code. This error should be passed further instead
of being ignored.

Signed-off-by: Ionut Nicu <ioan.nicu.ext@nsn.com>
Acked-by: Peter Korsgaard <peter.korsgaard@barco.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/muxes/i2c-mux-gpio.c

index 5d4a99ba743e39b21a9483ce2a15aabb41a84934..7f343bcd492ee018b1e3413d62a660fa157339c6 100644 (file)
@@ -66,7 +66,7 @@ static int i2c_mux_gpio_probe_dt(struct gpiomux *mux,
        struct device_node *adapter_np, *child;
        struct i2c_adapter *adapter;
        unsigned *values, *gpios;
-       int i = 0;
+       int i = 0, ret;
 
        if (!np)
                return -ENODEV;
@@ -116,8 +116,12 @@ static int i2c_mux_gpio_probe_dt(struct gpiomux *mux,
                return -ENOMEM;
        }
 
-       for (i = 0; i < mux->data.n_gpios; i++)
-               gpios[i] = of_get_named_gpio(np, "mux-gpios", i);
+       for (i = 0; i < mux->data.n_gpios; i++) {
+               ret = of_get_named_gpio(np, "mux-gpios", i);
+               if (ret < 0)
+                       return ret;
+               gpios[i] = ret;
+       }
 
        mux->data.gpios = gpios;