]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
regulator: axp20x: Fix reference cout leak
authorPan Bian <bianpan2016@163.com>
Wed, 20 Jan 2021 12:33:13 +0000 (04:33 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Mar 2021 08:39:44 +0000 (09:39 +0100)
[ Upstream commit e78bf6be7edaacb39778f3a89416caddfc6c6d70 ]

Decrements the reference count of device node and its child node.

Fixes: dfe7a1b058bb ("regulator: AXP20x: Add support for regulators subsystem")
Signed-off-by: Pan Bian <bianpan2016@163.com>
Link: https://lore.kernel.org/r/20210120123313.107640-1-bianpan2016@163.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/regulator/axp20x-regulator.c

index 91b8ff8bac157de97e83974dcb4a2512ea3f0741..c9e3677ac734be5d9d8df2b2691e4c637e80875f 100644 (file)
@@ -558,7 +558,7 @@ static int axp20x_set_dcdc_freq(struct platform_device *pdev, u32 dcdcfreq)
 static int axp20x_regulator_parse_dt(struct platform_device *pdev)
 {
        struct device_node *np, *regulators;
-       int ret;
+       int ret = 0;
        u32 dcdcfreq = 0;
 
        np = of_node_get(pdev->dev.parent->of_node);
@@ -573,13 +573,12 @@ static int axp20x_regulator_parse_dt(struct platform_device *pdev)
                ret = axp20x_set_dcdc_freq(pdev, dcdcfreq);
                if (ret < 0) {
                        dev_err(&pdev->dev, "Error setting dcdc frequency: %d\n", ret);
-                       return ret;
                }
-
                of_node_put(regulators);
        }
 
-       return 0;
+       of_node_put(np);
+       return ret;
 }
 
 static int axp20x_set_dcdc_workmode(struct regulator_dev *rdev, int id, u32 workmode)