Skip to content

Commit 9b401f4

Browse files
Yang YingliangLinus Walleij
authored andcommitted
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: 5038a66 ("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>
1 parent 8f773bf commit 9b401f4

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

drivers/pinctrl/ti/pinctrl-ti-iodelay.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -876,15 +876,19 @@ static int ti_iodelay_probe(struct platform_device *pdev)
876876
iod->desc.name = dev_name(dev);
877877
iod->desc.owner = THIS_MODULE;
878878

879-
ret = pinctrl_register_and_init(&iod->desc, dev, iod, &iod->pctl);
879+
ret = devm_pinctrl_register_and_init(dev, &iod->desc, iod, &iod->pctl);
880880
if (ret) {
881881
dev_err(dev, "Failed to register pinctrl\n");
882882
goto exit_out;
883883
}
884884

885885
platform_set_drvdata(pdev, iod);
886886

887-
return pinctrl_enable(iod->pctl);
887+
ret = pinctrl_enable(iod->pctl);
888+
if (ret)
889+
goto exit_out;
890+
891+
return 0;
888892

889893
exit_out:
890894
of_node_put(np);
@@ -899,9 +903,6 @@ static void ti_iodelay_remove(struct platform_device *pdev)
899903
{
900904
struct ti_iodelay_device *iod = platform_get_drvdata(pdev);
901905

902-
if (iod->pctl)
903-
pinctrl_unregister(iod->pctl);
904-
905906
ti_iodelay_pinconf_deinit_dev(iod);
906907

907908
/* Expect other allocations to be freed by devm */

0 commit comments

Comments
 (0)