On Wed, Nov 16, 2016 at 01:18:49PM +0100, Uwe Kleine-König wrote:
> 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@xxxxxxxxxxxxxx>
Applied, thanks
Sascha
> ---
> drivers/i2c/busses/i2c-gpio.c | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
> index 9362ed181fe3..850db7b2f652 100644
> --- a/drivers/i2c/busses/i2c-gpio.c
> +++ b/drivers/i2c/busses/i2c-gpio.c
> @@ -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);
>
> --
> 2.10.2
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
