---

yaml --- r: 222781 b: refs/heads/master c: e36c1df h: refs/heads/master i: 222779: 0fe6e1c v: v3
git-mirror · Nov 30, 2010 · ade798a · ade798a
1 parent 1f8fc28
commit ade798a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa7a74040a989eeb7a9265550a2538863e842a93
+refs/heads/master: e36c1df8e18183ba2c691fe766a52c94020cdc5e
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
@@ -1312,10 +1312,12 @@ static int _regulator_enable(struct regulator_dev *rdev)
 			if (ret < 0)
 				return ret;
 
-			if (delay >= 1000)
+			if (delay >= 1000) {
 				mdelay(delay / 1000);
-			else if (delay)
+				udelay(delay % 1000);
+			} else if (delay) {
 				udelay(delay);
+			}
 
 		} else if (ret < 0) {
 			printk(KERN_ERR "%s: is_enabled() failed for %s: %d\n",