2013-10-08 13:52:07

by Ionut Nicu

Subject: [PATCH 2/2] i2c-mux-gpio: don't ignore of_get_named_gpio errors

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 <[email protected]>
---
drivers/i2c/muxes/i2c-mux-gpio.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c
index eb99f04..6370b47 100644
--- a/drivers/i2c/muxes/i2c-mux-gpio.c
+++ b/drivers/i2c/muxes/i2c-mux-gpio.c
@@ -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;

--
1.7.1

2013-10-08 14:52:57

by Peter Korsgaard

Subject: Re: [PATCH 2/2] i2c-mux-gpio: don't ignore of_get_named_gpio errors

>>>>> "IN" == Ionut Nicu <[email protected]> writes:

IN> of_get_named_gpio could return -E_PROBE_DEFER or another
IN> error code. This error should be passed further instead
IN> of being ignored.

Acked-by: Peter Korsgaard <[email protected]>

--
Sorry about disclaimer - It's out of my control.
Bye, Peter Korsgaard
This message is subject to the following terms and conditions: MAIL DISCLAIMER<http://www.barco.com/en/maildisclaimer>