aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/pinctrl-pistachio.c
diff options
context:
space:
mode:
authorWei Yongjun <weiyj.lk@gmail.com>2016-07-26 14:52:57 +0000
committerLinus Walleij <linus.walleij@linaro.org>2016-08-10 15:45:54 +0200
commitb120a3c286520ca465c54e8afa442be10560053b (patch)
tree43a04f4d04a18212d041c97f86abc569cc556ced /drivers/pinctrl/pinctrl-pistachio.c
parentpinctrl: meson: Drop pinctrl_unregister for devm_ registered device (diff)
downloadlinux-dev-b120a3c286520ca465c54e8afa442be10560053b.tar.xz
linux-dev-b120a3c286520ca465c54e8afa442be10560053b.zip
pinctrl: pistachio: Drop pinctrl_unregister for devm_ registered device
It's not necessary to unregister pin controller device registered with devm_pinctrl_register() and using pinctrl_unregister() leads to a double free. This is detected by Coccinelle semantic patch. Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-pistachio.c')
-rw-r--r--drivers/pinctrl/pinctrl-pistachio.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/pinctrl/pinctrl-pistachio.c b/drivers/pinctrl/pinctrl-pistachio.c
index c6d410ef8de0..7bad200bd67c 100644
--- a/drivers/pinctrl/pinctrl-pistachio.c
+++ b/drivers/pinctrl/pinctrl-pistachio.c
@@ -1432,7 +1432,6 @@ static int pistachio_pinctrl_probe(struct platform_device *pdev)
{
struct pistachio_pinctrl *pctl;
struct resource *res;
- int ret;
pctl = devm_kzalloc(&pdev->dev, sizeof(*pctl), GFP_KERNEL);
if (!pctl)
@@ -1464,13 +1463,7 @@ static int pistachio_pinctrl_probe(struct platform_device *pdev)
return PTR_ERR(pctl->pctldev);
}
- ret = pistachio_gpio_register(pctl);
- if (ret < 0) {
- pinctrl_unregister(pctl->pctldev);
- return ret;
- }
-
- return 0;
+ return pistachio_gpio_register(pctl);
}
static struct platform_driver pistachio_pinctrl_driver = {