UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

i2c: 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 <ioan.nicu.ext@nsn.com>
Acked-by: Peter Korsgaard <peter.korsgaard@barco.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Ionut Nicu 2013-10-08 15:51:53 +02:00 committed by Wolfram Sang
parent 4cdbf7d346
commit 492ed77bfa
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/i2c/muxes/i2c-mux-gpio.c
View File

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