From 37a7f65f091b45264a950b28f2d44cba030b3e3e Mon Sep 17 00:00:00 2001
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sun, 12 Jun 2011 14:30:57 +0200
Subject: [PATCH] --- yaml --- r: 256633 b: refs/heads/master c:
 9ef28ccd59a23d219c4660f55a11ac06ca91f632 h: refs/heads/master i:   256631:
 b41e5fbe0442d867291be905bbc828d6c9ed508a v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/firewire/ohci.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ac0156d6d849..e07d5cf58664 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd6254e5c0efe01ad255188898cb3dadf98cb56d
+refs/heads/master: 9ef28ccd59a23d219c4660f55a11ac06ca91f632
diff --git a/trunk/drivers/firewire/ohci.c b/trunk/drivers/firewire/ohci.c
index e291edaa5eef..3b6f3429fb4a 100644
--- a/trunk/drivers/firewire/ohci.c
+++ b/trunk/drivers/firewire/ohci.c
@@ -1200,12 +1200,13 @@ static void context_stop(struct context *ctx)
 	reg_write(ctx->ohci, CONTROL_CLEAR(ctx->regs), CONTEXT_RUN);
 	ctx->running = false;
 
-	for (i = 0; i < 10; i++) {
+	for (i = 0; i < 1000; i++) {
 		reg = reg_read(ctx->ohci, CONTROL_SET(ctx->regs));
 		if ((reg & CONTEXT_ACTIVE) == 0)
 			return;
 
-		mdelay(1);
+		if (i)
+			udelay(10);
 	}
 	fw_error("Error: DMA context still active (0x%08x)\n", reg);
 }