From ec3f9d43073dcbc18d2b3c984cba3c8bfebae7a8 Mon Sep 17 00:00:00 2001
From: David Fries <david@fries.net>
Date: Wed, 15 Oct 2008 22:05:01 -0700
Subject: [PATCH] --- yaml --- r: 114931 b: refs/heads/master c:
 cadd486cfc838ead0ad899db129cff9f61ef4267 h: refs/heads/master i:   114929:
 aa22c07e450a1887b2ccd3b0c37363c4f3080d23   114927:
 f40a52dc130b3e6080bc81cabb6bc53a9d9bfec3 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/w1/masters/ds1wm.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0f93f9de65fb..de1419bd5ed8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e3dae2b4727dc216e2dc16d2f0271b5f31b680c
+refs/heads/master: cadd486cfc838ead0ad899db129cff9f61ef4267
diff --git a/trunk/drivers/w1/masters/ds1wm.c b/trunk/drivers/w1/masters/ds1wm.c
index ea894bf18113..29e144f81cbe 100644
--- a/trunk/drivers/w1/masters/ds1wm.c
+++ b/trunk/drivers/w1/masters/ds1wm.c
@@ -160,8 +160,10 @@ static int ds1wm_reset(struct ds1wm_data *ds1wm_data)
 	 *     625 us - 60 us - 240 us - 100 ns = 324.9 us
 	 *
 	 * We'll wait a bit longer just to be sure.
+	 * Was udelay(500), but if it is going to busywait the cpu that long,
+	 * might as well come back later.
 	 */
-	udelay(500);
+	msleep(1);
 
 	ds1wm_write_register(ds1wm_data, DS1WM_INT_EN,
 		DS1WM_INTEN_ERBF | DS1WM_INTEN_ETMT | DS1WM_INTEN_EPD |