diff options
author | Pramod Gurav <pramod.gurav@smartplayin.com> | 2014-09-09 04:05:52 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2014-09-23 06:23:09 -0400 |
commit | 849a8c25c80a2cde824072813bf4aabbc79b8789 (patch) | |
tree | 69771f8abd0ffe174394bb8305584fef712a81d0 | |
parent | 3dac1918a4912cea9375e76cb3916b751cef22db (diff) |
pinctrl: lantiq: Release gpiochip resources in fail case
This patch releases gpiochip resources with of_gpiochip_remove
and gpiochip_remove in failure cases.
CC: John Crispin <blogic@openwrt.org>
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>
-rw-r--r-- | drivers/pinctrl/pinctrl-xway.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c index e66f4cae7633..37040ab42890 100644 --- a/drivers/pinctrl/pinctrl-xway.c +++ b/drivers/pinctrl/pinctrl-xway.c | |||
@@ -801,6 +801,7 @@ static int pinmux_xway_probe(struct platform_device *pdev) | |||
801 | of_gpiochip_add(&xway_chip); | 801 | of_gpiochip_add(&xway_chip); |
802 | ret = gpiochip_add(&xway_chip); | 802 | ret = gpiochip_add(&xway_chip); |
803 | if (ret) { | 803 | if (ret) { |
804 | of_gpiochip_remove(&xway_chip); | ||
804 | dev_err(&pdev->dev, "Failed to register gpio chip\n"); | 805 | dev_err(&pdev->dev, "Failed to register gpio chip\n"); |
805 | return ret; | 806 | return ret; |
806 | } | 807 | } |
@@ -822,6 +823,7 @@ static int pinmux_xway_probe(struct platform_device *pdev) | |||
822 | /* register with the generic lantiq layer */ | 823 | /* register with the generic lantiq layer */ |
823 | ret = ltq_pinctrl_register(pdev, &xway_info); | 824 | ret = ltq_pinctrl_register(pdev, &xway_info); |
824 | if (ret) { | 825 | if (ret) { |
826 | gpiochip_remove(&xway_chip); | ||
825 | dev_err(&pdev->dev, "Failed to register pinctrl driver\n"); | 827 | dev_err(&pdev->dev, "Failed to register pinctrl driver\n"); |
826 | return ret; | 828 | return ret; |
827 | } | 829 | } |