| From 1ae6e09dd1ebef6a6717fae830dfdfcf09e13df0 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Thu, 28 Mar 2019 14:13:47 +0100 |
| Subject: gpio: of: Fix of_gpiochip_add() error path |
| |
| [ Upstream commit f7299d441a4da8a5088e651ea55023525a793a13 ] |
| |
| If the call to of_gpiochip_scan_gpios() in of_gpiochip_add() fails, no |
| error handling is performed. This lead to the need of callers to call |
| of_gpiochip_remove() on failure, which causes "BAD of_node_put() on ..." |
| if the failure happened before the call to of_node_get(). |
| |
| Fix this by adding proper error handling. |
| |
| Note that calling gpiochip_remove_pin_ranges() multiple times causes no |
| harm: subsequent calls are a no-op. |
| |
| Fixes: dfbd379ba9b7431e ("gpio: of: Return error if gpio hog configuration failed") |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Reviewed-by: Mukesh Ojha <mojha@codeaurora.org> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Sasha Levin (Microsoft) <sashal@kernel.org> |
| --- |
| drivers/gpio/gpiolib-of.c | 8 +++++++- |
| 1 file changed, 7 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c |
| index ee8c046cab62..d6ed4e891b34 100644 |
| --- a/drivers/gpio/gpiolib-of.c |
| +++ b/drivers/gpio/gpiolib-of.c |
| @@ -499,7 +499,13 @@ int of_gpiochip_add(struct gpio_chip *chip) |
| |
| of_node_get(chip->of_node); |
| |
| - return of_gpiochip_scan_gpios(chip); |
| + status = of_gpiochip_scan_gpios(chip); |
| + if (status) { |
| + of_node_put(chip->of_node); |
| + gpiochip_remove_pin_ranges(chip); |
| + } |
| + |
| + return status; |
| } |
| |
| void of_gpiochip_remove(struct gpio_chip *chip) |
| -- |
| 2.19.1 |
| |
