From 55a51b0f5ee9dea17e236ea0670f7a6f1af7e471 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <drzeus@drzeus.cx>
Date: Sun, 22 Oct 2006 22:13:10 +0200
Subject: [PATCH] --- yaml --- r: 41443 b: refs/heads/master c:
 73778120c4088a0a7b59c4c378904f7a230b4820 h: refs/heads/master i:   41441:
 6409235e991fa090a0de0ed2cab7fe4d921279b9   41439:
 4bb82238e57289683642a7450aa75cf3ee00974c v: v3

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

diff --git a/[refs] b/[refs]
index 5d19f95b8288..88677649ec18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e45a1bd20fa5b920901879e85cdf5eda21f78d7c
+refs/heads/master: 73778120c4088a0a7b59c4c378904f7a230b4820
diff --git a/trunk/drivers/mmc/mmc.c b/trunk/drivers/mmc/mmc.c
index 1593a6a632cf..82b7643c1654 100644
--- a/trunk/drivers/mmc/mmc.c
+++ b/trunk/drivers/mmc/mmc.c
@@ -454,11 +454,11 @@ static void mmc_deselect_cards(struct mmc_host *host)
 
 static inline void mmc_delay(unsigned int ms)
 {
-	if (ms < HZ / 1000) {
-		yield();
+	if (ms < 1000 / HZ) {
+		cond_resched();
 		mdelay(ms);
 	} else {
-		msleep_interruptible (ms);
+		msleep(ms);
 	}
 }