---

yaml --- r: 282198 b: refs/heads/master c: 32c78de h: refs/heads/master v: v3
git-mirror · Dec 29, 2011 · b415ce4 · b415ce4
1 parent 7b2cd3e
commit b415ce4
Show file tree

Hide file tree

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