Skip to content

Commit

Permalink
gpio: of: Return error if gpio hog configuration failed
Browse files Browse the repository at this point in the history
If GPIO hog configuration failed while adding OF based
gpiochip() then return the error instead of ignoring it.

This helps of properly handling the gpio driver dependency.

When adding the gpio hog nodes for NVIDIA's Tegra210 platforms,
the gpio_hogd() fails with EPROBE_DEFER because pinctrl is not
ready at this time and gpio_request() for Tegra GPIO driver
returns error. The error was not causing the Tegra GPIO driver
to fail as the error was getting ignored.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Cc: Benoit Parrot <bparrot@ti.com>
Cc: Alexandre Courbot <acourbot@nvidia.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Laxman Dewangan authored and Linus Walleij committed Apr 13, 2016
1 parent cd97a44 commit dfbd379
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions drivers/gpio/gpiolib-of.c
Original file line number Diff line number Diff line change
Expand Up @@ -201,14 +201,16 @@ static struct gpio_desc *of_parse_own_gpio(struct device_node *np,
*
* This is only used by of_gpiochip_add to request/set GPIO initial
* configuration.
* It retures error if it fails otherwise 0 on success.
*/
static void of_gpiochip_scan_gpios(struct gpio_chip *chip)
static int of_gpiochip_scan_gpios(struct gpio_chip *chip)
{
struct gpio_desc *desc = NULL;
struct device_node *np;
const char *name;
enum gpio_lookup_flags lflags;
enum gpiod_flags dflags;
int ret;

for_each_child_of_node(chip->of_node, np) {
if (!of_property_read_bool(np, "gpio-hog"))
Expand All @@ -218,9 +220,12 @@ static void of_gpiochip_scan_gpios(struct gpio_chip *chip)
if (IS_ERR(desc))
continue;

if (gpiod_hog(desc, name, lflags, dflags))
continue;
ret = gpiod_hog(desc, name, lflags, dflags);
if (ret < 0)
return ret;
}

return 0;
}

/**
Expand Down Expand Up @@ -442,9 +447,7 @@ int of_gpiochip_add(struct gpio_chip *chip)

of_node_get(chip->of_node);

of_gpiochip_scan_gpios(chip);

return 0;
return of_gpiochip_scan_gpios(chip);
}

void of_gpiochip_remove(struct gpio_chip *chip)
Expand Down

0 comments on commit dfbd379

Please sign in to comment.