diff options
| author | Pramod Gurav <pramod.gurav@smartplayin.com> | 2014-09-09 15:50:36 +0530 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-09-23 16:45:22 +0200 |
| commit | 70e4197420a154a2a684b6e7b496dda70b20d9ec (patch) | |
| tree | 0319a6cf1d53a9ab4db83f679a61cf671e50dd14 /drivers/pinctrl/pinctrl-at91.c | |
| parent | 849a8c25c80a2cde824072813bf4aabbc79b8789 (diff) | |
| download | op-kernel-dev-70e4197420a154a2a684b6e7b496dda70b20d9ec.zip op-kernel-dev-70e4197420a154a2a684b6e7b496dda70b20d9ec.tar.gz | |
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: Pramod Gurav <pramod.gurav@smartplayin.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-at91.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-at91.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c index 22b82ad..71a8e8c 100644 --- a/drivers/pinctrl/pinctrl-at91.c +++ b/drivers/pinctrl/pinctrl-at91.c @@ -1738,16 +1738,19 @@ static int at91_gpio_probe(struct platform_device *pdev) at91_chip->clock = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(at91_chip->clock)) { dev_err(&pdev->dev, "failed to get clock, ignoring.\n"); + ret = PTR_ERR(at91_chip->clock); goto err; } - if (clk_prepare(at91_chip->clock)) - goto err; + ret = clk_prepare(at91_chip->clock); + if (ret) + goto clk_prepare_err; /* 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"); - goto clk_err; + goto clk_enable_err; } at91_chip->chip = at91_gpio_template; @@ -1772,7 +1775,7 @@ static int at91_gpio_probe(struct platform_device *pdev) if (!names) { ret = -ENOMEM; - goto clk_err; + goto clk_enable_err; } for (i = 0; i < chip->ngpio; i++) @@ -1790,7 +1793,7 @@ static int at91_gpio_probe(struct platform_device *pdev) ret = gpiochip_add(chip); if (ret) - goto clk_err; + goto gpiochip_add_err; gpio_chips[alias_idx] = at91_chip; gpio_banks = max(gpio_banks, alias_idx + 1); @@ -1803,8 +1806,11 @@ static int at91_gpio_probe(struct platform_device *pdev) return 0; -clk_err: +gpiochip_add_err: + clk_disable(at91_chip->clock); +clk_enable_err: clk_unprepare(at91_chip->clock); +clk_prepare_err: err: dev_err(&pdev->dev, "Failure %i for GPIO %i\n", ret, alias_idx); |
