From ade798a435b8e817c27853aaad53a2c0f6d01b5a Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Fri, 5 Nov 2010 21:51:32 +0800
Subject: [PATCH] --- yaml --- r: 222781 b: refs/heads/master c:
 e36c1df8e18183ba2c691fe766a52c94020cdc5e h: refs/heads/master i:   222779:
 0fe6e1c40e1b75d786e639eae0043de8b429d7e7 v: v3

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

diff --git a/[refs] b/[refs]
index c678b5bc88e5..7ca3c55a991b 100644
--- 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
index c3f93b401e90..9da85bc21db4 100644
--- 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",