| Message ID | 1455875906-5048-1-git-send-email-geert+renesas@glider.be |
|---|---|
| State | New |
| Headers | show |
On Fri, Feb 19, 2016 at 10:58 AM, Geert Uytterhoeven <geert+renesas@glider.be> wrote: > At this point in gpio_keys_polled_probe(), button->gpiod contains either > a pointer to a GPIO descriptor or NULL, because: > - gpio_keys_polled_get_devtree_pdata() fills in button->gpiod only if > devm_get_gpiod_from_child() succeeded, > - gpio_to_desc() returns NULL on failure, not an ERR_PTR(), > - button->gpiod is untouched if it was NULL, and button->gpio is not > valid. > > Hence check for NULL only, and return -EINVAL on failure. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Sorry, scratch this, sent to wrong audience. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c index 62bdb1d48c49dbd9..1ef3c66099a50d72 100644 --- a/drivers/input/keyboard/gpio_keys_polled.c +++ b/drivers/input/keyboard/gpio_keys_polled.c @@ -330,8 +330,8 @@ static int gpio_keys_polled_probe(struct platform_device *pdev) button->gpiod = gpio_to_desc(button->gpio); } - if (IS_ERR(button->gpiod)) - return PTR_ERR(button->gpiod); + if (!button->gpiod) + return -EINVAL; bdata->can_sleep = gpiod_cansleep(button->gpiod); bdata->last_state = -1;
At this point in gpio_keys_polled_probe(), button->gpiod contains either a pointer to a GPIO descriptor or NULL, because: - gpio_keys_polled_get_devtree_pdata() fills in button->gpiod only if devm_get_gpiod_from_child() succeeded, - gpio_to_desc() returns NULL on failure, not an ERR_PTR(), - button->gpiod is untouched if it was NULL, and button->gpio is not valid. Hence check for NULL only, and return -EINVAL on failure. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- Question: Should it return -ENOENT instead? --- drivers/input/keyboard/gpio_keys_polled.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)