From a56e130bc1dd1816a978aca8e22ac10ca0726363 Mon Sep 17 00:00:00 2001
From: Paul Walmsley <paul@pwsan.com>
Date: Sat, 25 Apr 2009 05:28:36 -0600
Subject: [PATCH] --- yaml --- r: 144268 b: refs/heads/master c:
 53032dafc6b93ac178ca2340ff8eb4ee2b3d1a92 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index edc12e1f8547..2cf1eeca08e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd78dfc6c6e321a310a73ef7b0df3d262704dd55
+refs/heads/master: 53032dafc6b93ac178ca2340ff8eb4ee2b3d1a92
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index cb62be63caed..2f14c16f58c3 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -2080,6 +2080,10 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
 
 scrub:
 	device_unregister(&rdev->dev);
+	/* device core frees rdev */
+	rdev = ERR_PTR(ret);
+	goto out;
+
 clean:
 	kfree(rdev);
 	rdev = ERR_PTR(ret);