summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2015-02-20 16:08:44 +0000
committerMark Brown <broonie@kernel.org>2015-02-21 23:30:30 +0900
commita7b976ae4bff9ff4f9c9943d3232dec7e87c68b9 (patch)
tree823648d45b3f9a161f6135bd63a984321e233668 /drivers/regulator
parentbfa76d49576599a4b9f9b7a71f23d73d6dcff735 (diff)
downloadop-kernel-dev-a7b976ae4bff9ff4f9c9943d3232dec7e87c68b9.zip
op-kernel-dev-a7b976ae4bff9ff4f9c9943d3232dec7e87c68b9.tar.gz
regulator: arizona-micsupp: Drop OF node reference on error path
We were not calling of_node_put if the regulator failed to register this patch fixes this. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/arizona-micsupp.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/regulator/arizona-micsupp.c b/drivers/regulator/arizona-micsupp.c
index 2007900..4116e74 100644
--- a/drivers/regulator/arizona-micsupp.c
+++ b/drivers/regulator/arizona-micsupp.c
@@ -284,6 +284,9 @@ static int arizona_micsupp_probe(struct platform_device *pdev)
micsupp->regulator = devm_regulator_register(&pdev->dev,
desc,
&config);
+
+ of_node_put(config.of_node);
+
if (IS_ERR(micsupp->regulator)) {
ret = PTR_ERR(micsupp->regulator);
dev_err(arizona->dev, "Failed to register mic supply: %d\n",
@@ -291,8 +294,6 @@ static int arizona_micsupp_probe(struct platform_device *pdev)
return ret;
}
- of_node_put(config.of_node);
-
platform_set_drvdata(pdev, micsupp);
return 0;
OpenPOWER on IntegriCloud