---

yaml --- r: 165398 b: refs/heads/master c: a7433cf h: refs/heads/master v: v3
git-mirror · Sep 22, 2009 · 0ecf230 · 0ecf230
1 parent 30af7c6
commit 0ecf230
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e108d33edcb88bac3db39ba1683fc2c0591d7d4
+refs/heads/master: a7433cff9ed8e7982de8e0f210f0325d0f3d1949
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
@@ -1236,11 +1236,12 @@ static int _regulator_enable(struct regulator_dev *rdev)
 			} else {
 				return -EINVAL;
 			}
-		} else {
+		} else if (ret < 0) {
 			printk(KERN_ERR "%s: is_enabled() failed for %s: %d\n",
 			       __func__, rdev->desc->name, ret);
 			return ret;
 		}
+		/* Fallthrough on positive return values - already enabled */
 	}
 
 	rdev->use_count++;