---

yaml --- r: 114931 b: refs/heads/master c: cadd486 h: refs/heads/master i: 114929: aa22c07 114927: f40a52d v: v3
git-mirror · Oct 16, 2008 · ec3f9d4 · ec3f9d4
1 parent 213ebda
commit ec3f9d4
Show file tree

Hide file tree

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