summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-01-16 09:17:13 +0000
committerLinus Walleij <linus.walleij@linaro.org>2013-02-05 13:54:24 +0100
commitd41e35c364391d5c80467f62eecec8c4c65342f4 (patch)
tree3224cdc5919ef26abf57a6f7edde3c3edb151242 /drivers/pinctrl
parent83b423c885337415a680748cbd40f732734ab0b1 (diff)
downloadlinux-d41e35c364391d5c80467f62eecec8c4c65342f4.tar.bz2
pinctrl/abx500: destroy mutex if returning early due to error
Current failure path neglects to mutex_destroy() before returning an error due to an invalid parameter or an error received from gpiochip_add(). This patch aims to remedy that behaviour. Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/pinctrl-abx500.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pinctrl/pinctrl-abx500.c b/drivers/pinctrl/pinctrl-abx500.c
index 426b47cd6433..81ef5152714b 100644
--- a/drivers/pinctrl/pinctrl-abx500.c
+++ b/drivers/pinctrl/pinctrl-abx500.c
@@ -1155,11 +1155,13 @@ static int abx500_gpio_probe(struct platform_device *pdev)
default:
dev_err(&pdev->dev, "Unsupported pinctrl sub driver (%d)\n",
(int) platid->driver_data);
+ mutex_destroy(&pct->lock);
return -EINVAL;
}
if (!pct->soc) {
dev_err(&pdev->dev, "Invalid SOC data\n");
+ mutex_destroy(&pct->lock);
return -EINVAL;
}
@@ -1176,6 +1178,7 @@ static int abx500_gpio_probe(struct platform_device *pdev)
ret = gpiochip_add(&pct->chip);
if (ret) {
dev_err(&pdev->dev, "unable to add gpiochip: %d\n", ret);
+ mutex_destroy(&pct->lock);
goto out_rem_irq;
}
dev_info(&pdev->dev, "added gpiochip\n");