From 6125d74577e429f6a9eeb4677c8353ddf2b5dd80 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 7 May 2012 11:34:52 +0100
Subject: [PATCH] --- yaml --- r: 300111 b: refs/heads/master c:
 968c2c1707a3396ccd6e7e6c5ddaf658a6d3bd66 h: refs/heads/master i:   300109:
 5f3c4c728ebfdc32f93880be9d954bf80fe96600   300107:
 c945507bf5e64904341a92409c9edf5cf66054be   300103:
 8a6dcb5a955f9738104fe88edc36154fe590f8dc   300095:
 bbcaf1f75ca7e89efea2800780f793ffd3e189fd v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/regulator/core.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 81f8cf3d0133..fc1128764ec6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f55205f4d4a8823a11bb8b37ef2ecbd78fb09463
+refs/heads/master: 968c2c1707a3396ccd6e7e6c5ddaf658a6d3bd66
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index e70dd382a009..046fb1bd8619 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -1431,7 +1431,10 @@ void devm_regulator_put(struct regulator *regulator)
 
 	rc = devres_destroy(regulator->dev, devm_regulator_release,
 			    devm_regulator_match, regulator);
-	WARN_ON(rc);
+	if (rc == 0)
+		regulator_put(regulator);
+	else
+		WARN_ON(rc);
 }
 EXPORT_SYMBOL_GPL(devm_regulator_put);