Commit 70e41974 authored by Pramod Gurav's avatar Pramod Gurav Committed by Linus Walleij

pinctrl: at91: Fix failure path in at91_gpio_probe path

This fixes the whole error handling in probe function by capturing and
returning error values on kernel function like clk_prepare,
clk_enable, gpiochip_add etc.

CC: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
CC: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarPramod Gurav <pramod.gurav@smartplayin.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 849a8c25
...@@ -1738,16 +1738,19 @@ static int at91_gpio_probe(struct platform_device *pdev) ...@@ -1738,16 +1738,19 @@ static int at91_gpio_probe(struct platform_device *pdev)
at91_chip->clock = devm_clk_get(&pdev->dev, NULL); at91_chip->clock = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(at91_chip->clock)) { if (IS_ERR(at91_chip->clock)) {
dev_err(&pdev->dev, "failed to get clock, ignoring.\n"); dev_err(&pdev->dev, "failed to get clock, ignoring.\n");
ret = PTR_ERR(at91_chip->clock);
goto err; goto err;
} }
if (clk_prepare(at91_chip->clock)) ret = clk_prepare(at91_chip->clock);
goto err; if (ret)
goto clk_prepare_err;
/* enable PIO controller's clock */ /* enable PIO controller's clock */
if (clk_enable(at91_chip->clock)) { ret = clk_enable(at91_chip->clock);
if (ret) {
dev_err(&pdev->dev, "failed to enable clock, ignoring.\n"); dev_err(&pdev->dev, "failed to enable clock, ignoring.\n");
goto clk_err; goto clk_enable_err;
} }
at91_chip->chip = at91_gpio_template; at91_chip->chip = at91_gpio_template;
...@@ -1772,7 +1775,7 @@ static int at91_gpio_probe(struct platform_device *pdev) ...@@ -1772,7 +1775,7 @@ static int at91_gpio_probe(struct platform_device *pdev)
if (!names) { if (!names) {
ret = -ENOMEM; ret = -ENOMEM;
goto clk_err; goto clk_enable_err;
} }
for (i = 0; i < chip->ngpio; i++) for (i = 0; i < chip->ngpio; i++)
...@@ -1790,7 +1793,7 @@ static int at91_gpio_probe(struct platform_device *pdev) ...@@ -1790,7 +1793,7 @@ static int at91_gpio_probe(struct platform_device *pdev)
ret = gpiochip_add(chip); ret = gpiochip_add(chip);
if (ret) if (ret)
goto clk_err; goto gpiochip_add_err;
gpio_chips[alias_idx] = at91_chip; gpio_chips[alias_idx] = at91_chip;
gpio_banks = max(gpio_banks, alias_idx + 1); gpio_banks = max(gpio_banks, alias_idx + 1);
...@@ -1803,8 +1806,11 @@ static int at91_gpio_probe(struct platform_device *pdev) ...@@ -1803,8 +1806,11 @@ static int at91_gpio_probe(struct platform_device *pdev)
return 0; return 0;
clk_err: gpiochip_add_err:
clk_disable(at91_chip->clock);
clk_enable_err:
clk_unprepare(at91_chip->clock); clk_unprepare(at91_chip->clock);
clk_prepare_err:
err: err:
dev_err(&pdev->dev, "Failure %i for GPIO %i\n", ret, alias_idx); dev_err(&pdev->dev, "Failure %i for GPIO %i\n", ret, alias_idx);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment