Commit c6e927a2 authored Aug 29, 2014 by Pramod Gurav Committed by Linus Walleij Sep 02, 2014

pinctrl: qcom: remove gpiochip in failure cases



This patch releases gpiochip related resources by calling
gpiochip_remove when either of gpiochip_add_pin_range and
gpiochip_irqchip_add fails.

CC: Linus Walleij <linus.walleij@linaro.org>
CC: "Ivan T. Ivanov" <iivanov@mm-sol.com>
Acked-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Pramod Gurav <pramod.gurav@smartplayin.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

parent a1984200

drivers/pinctrl/qcom/pinctrl-msm.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -829,6 +829,7 @@ static int msm_gpio_init(struct msm_pinctrl *pctrl)
		ret = gpiochip_add_pin_range(&pctrl->chip, dev_name(pctrl->dev), 0, 0, chip->ngpio);
		if (ret) {
		dev_err(pctrl->dev, "Failed to add pin range\n");
		gpiochip_remove(&pctrl->chip);
		return ret;
		}

		@@ -839,6 +840,7 @@ static int msm_gpio_init(struct msm_pinctrl *pctrl)
		IRQ_TYPE_NONE);
		if (ret) {
		dev_err(pctrl->dev, "Failed to add irqchip to gpiochip\n");
		gpiochip_remove(&pctrl->chip);
		return -ENOSYS;
		}