summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-05-13 18:35:56 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-01 15:18:15 +0800
commit538926ed486b8012193586e0c2dceda20e9c032a (patch)
tree0067bfc02adb9d5ee1ffb9a7c64a5174409581ca /drivers/regulator
parent4c68b0f805f759fa0c61b9bbfb2ca0324b00cbd3 (diff)
downloadlwn-538926ed486b8012193586e0c2dceda20e9c032a.tar.gz
lwn-538926ed486b8012193586e0c2dceda20e9c032a.zip
regulator: core: Release regulator-regulator supplies on error
commit e81dba85c6388dfabcb76cbc2b8bd02836a53ae5 upstream. If we fail while registering a regulator make sure we release the supply for the regulator if there is one. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 046fb1bd8619..c18f0fd1577f 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2971,6 +2971,8 @@ unset_supplies:
unset_regulator_supplies(rdev);
scrub:
+ if (rdev->supply)
+ regulator_put(rdev->supply);
kfree(rdev->constraints);
device_unregister(&rdev->dev);
/* device core frees rdev */