From: Pramod Gurav Date: Tue, 9 Sep 2014 08:05:52 +0000 (+0530) Subject: pinctrl: lantiq: Release gpiochip resources in fail case X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=849a8c25c80a2cde824072813bf4aabbc79b8789;p=openwrt%2Fstaging%2Fblogic.git 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 CC: Linus Walleij Signed-off-by: Pramod Gurav Signed-off-by: Linus Walleij --- 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) of_gpiochip_add(&xway_chip); ret = gpiochip_add(&xway_chip); if (ret) { + of_gpiochip_remove(&xway_chip); dev_err(&pdev->dev, "Failed to register gpio chip\n"); return ret; } @@ -822,6 +823,7 @@ static int pinmux_xway_probe(struct platform_device *pdev) /* register with the generic lantiq layer */ ret = ltq_pinctrl_register(pdev, &xway_info); if (ret) { + gpiochip_remove(&xway_chip); dev_err(&pdev->dev, "Failed to register pinctrl driver\n"); return ret; }