---

yaml --- r: 300111 b: refs/heads/master c: 968c2c1 h: refs/heads/master i: 300109: 5f3c4c7 300107: c945507 300103: 8a6dcb5 300095: bbcaf1f v: v3
git-mirror · May 7, 2012 · 6125d74 · 6125d74
1 parent 8e99d33
commit 6125d74
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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);