sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

i2c: gpio: fix handling of return code of of_get_gpio 

Instead of using gpio_is_valid just check the return code of of_get_gpio
for being < 0. This fixes -EPROBE_DEFER handling as now this error code
is handed to the caller instead of -ENODEV. If the gpio returned by
of_get_gpio is an invalid number this isn't noticed by
of_i2c_gpio_probe, but then gpio_request later fails which is good
enough.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Uwe Kleine-König 2016-11-16 13:18:49 +01:00 committed by Sascha Hauer
parent 8eb1fb3519
commit 8303208e95
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/i2c/busses/i2c-gpio.c
View File

@ -89,6 +89,7 @@ static int of_i2c_gpio_probe(struct device_node *np,
struct i2c_gpio_platform_data *pdata)
{
u32 reg;
int ret;
if (!IS_ENABLED(CONFIG_OFDEVICE))
return -ENODEV;
@ -96,14 +97,15 @@ static int of_i2c_gpio_probe(struct device_node *np,
if (of_gpio_count(np) < 2)
return -ENODEV;
pdata->sda_pin = of_get_gpio(np, 0);
pdata->scl_pin = of_get_gpio(np, 1);
ret = of_get_gpio(np, 0);
if (ret < 0)
return ret;
pdata->sda_pin = ret;
if (!gpio_is_valid(pdata->sda_pin) || !gpio_is_valid(pdata->scl_pin)) {
pr_err("%s: invalid GPIO pins, sda=%d/scl=%d\n",
np->full_name, pdata->sda_pin, pdata->scl_pin);
return -ENODEV;
}
ret = of_get_gpio(np, 1);
if (ret < 0)
return ret;
pdata->scl_pin = ret;
of_property_read_u32(np, "i2c-gpio,delay-us", &pdata->udelay);