pinctrl: ti: ti-iodelay: fix possible memory leak when pinctrl_enable() fails

This driver calls pinctrl_register_and_init() which is not
devm_ managed, it will leads memory leak if pinctrl_enable()
fails. Replace it with devm_pinctrl_register_and_init().
And add missing of_node_put() in the error path.

Fixes: 5038a66dad01 ("pinctrl: core: delete incorrect free in pinctrl_enable()")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/20240606023704.3931561-4-yangyingliang@huawei.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/ti/pinctrl-ti-iodelay.c b/drivers/pinctrl/ti/pinctrl-ti-iodelay.c
index 040f2c46a868def2dbcf54e7aff0c4954447d630..ef97586385019ad994f515a361134a9baddfe3ec 100644 (file)
--- a/drivers/pinctrl/ti/pinctrl-ti-iodelay.c
+++ b/drivers/pinctrl/ti/pinctrl-ti-iodelay.c
@@ -876,7 +876,7 @@ static int ti_iodelay_probe(struct platform_device *pdev)
        iod->desc.name = dev_name(dev);
        iod->desc.owner = THIS_MODULE;
 
-       ret = pinctrl_register_and_init(&iod->desc, dev, iod, &iod->pctl);
+       ret = devm_pinctrl_register_and_init(dev, &iod->desc, iod, &iod->pctl);
        if (ret) {
                dev_err(dev, "Failed to register pinctrl\n");
                goto exit_out;
@@ -884,7 +884,11 @@ static int ti_iodelay_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, iod);
 
-       return pinctrl_enable(iod->pctl);
+       ret = pinctrl_enable(iod->pctl);
+       if (ret)
+               goto exit_out;
+
+       return 0;
 
 exit_out:
        of_node_put(np);
@@ -899,9 +903,6 @@ static void ti_iodelay_remove(struct platform_device *pdev)
 {
        struct ti_iodelay_device *iod = platform_get_drvdata(pdev);
 
-       if (iod->pctl)
-               pinctrl_unregister(iod->pctl);
-
        ti_iodelay_pinconf_deinit_dev(iod);
 
        /* Expect other allocations to be freed by devm */