From b415ce42b5a0c3c3109f90936f6a28eb5464d250 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Thu, 29 Dec 2011 17:03:20 +0800
Subject: [PATCH] --- yaml --- r: 282198 b: refs/heads/master c:
 32c78de8f17369def492ea3ddd785f0cc140af02 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5963016fd830..cbcaf62f7cc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcda432194fc7c4a2dbe9d7146f00b4b21e66c8c
+refs/heads/master: 32c78de8f17369def492ea3ddd785f0cc140af02
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 6cb9d399affd..e70e15c4aa28 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -985,9 +985,8 @@ static int set_supply(struct regulator_dev *rdev,
 	rdev_info(rdev, "supplied by %s\n", rdev_get_name(supply_rdev));
 
 	rdev->supply = create_regulator(supply_rdev, &rdev->dev, "SUPPLY");
-	if (IS_ERR(rdev->supply)) {
-		err = PTR_ERR(rdev->supply);
-		rdev->supply = NULL;
+	if (rdev->supply == NULL) {
+		err = -ENOMEM;
 		return err;
 	}