| From 0d2c9a60f8006de595f0cfc83bc7c02f75758328 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 30 May 2020 22:19:52 +0200 |
| Subject: pinctrl: imxl: Fix an error handling path in |
| 'imx1_pinctrl_core_probe()' |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| [ Upstream commit 9eb728321286c4b31e964d2377fca2368526d408 ] |
| |
| When 'pinctrl_register()' has been turned into 'devm_pinctrl_register()', |
| an error handling path has not been updated. |
| |
| Axe a now unneeded 'pinctrl_unregister()'. |
| |
| Fixes: e55e025d1687 ("pinctrl: imxl: Use devm_pinctrl_register() for pinctrl registration") |
| Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Link: https://lore.kernel.org/r/20200530201952.585798-1-christophe.jaillet@wanadoo.fr |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/pinctrl/freescale/pinctrl-imx1-core.c | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| diff --git a/drivers/pinctrl/freescale/pinctrl-imx1-core.c b/drivers/pinctrl/freescale/pinctrl-imx1-core.c |
| index e2cca91fd2669..68108c4c3969a 100644 |
| --- a/drivers/pinctrl/freescale/pinctrl-imx1-core.c |
| +++ b/drivers/pinctrl/freescale/pinctrl-imx1-core.c |
| @@ -642,7 +642,6 @@ int imx1_pinctrl_core_probe(struct platform_device *pdev, |
| |
| ret = of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev); |
| if (ret) { |
| - pinctrl_unregister(ipctl->pctl); |
| dev_err(&pdev->dev, "Failed to populate subdevices\n"); |
| return ret; |
| } |
| -- |
| 2.25.1 |
| |
