]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
pinctrl: imxl: Fix an error handling path in 'imx1_pinctrl_core_probe()'
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Sat, 30 May 2020 20:19:52 +0000 (22:19 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 3 Jun 2020 12:30:49 +0000 (14:30 +0200)
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>
drivers/pinctrl/freescale/pinctrl-imx1-core.c

index 0c1c0e72fa8e553710adae6fd5c2a9ed346f69f3..08d110078c4398434409fab4ddad9662f162b55e 100644 (file)
@@ -638,7 +638,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;
        }