summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-05-13 18:35:56 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-05-14 09:31:35 +0100
commite81dba85c6388dfabcb76cbc2b8bd02836a53ae5 (patch)
treecb74bb4fd1c5547f7638aafc8cbefd2099978d9c /drivers/regulator
parent41097afd64108348a935c658c78662bce1ea6355 (diff)
downloadlinux-e81dba85c6388dfabcb76cbc2b8bd02836a53ae5.tar.bz2
regulator: core: Release regulator-regulator supplies on error
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> Cc: stable@vger.kernel.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 8918271f9e85..5a33282181d8 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -3193,6 +3193,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 */