From 9289716639ac526422041155cdf05c580ef8ead1 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Mon, 5 Jan 2009 20:43:23 +0100 Subject: [PATCH] --- yaml --- r: 130402 b: refs/heads/master c: b006854955254a971096c120d4ef115a7c6145fb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/firewire/fw-ohci.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4dd64c93a388..ced0b6753de7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d36a0df3b473fb53531484df227f2da8bc7494b +refs/heads/master: b006854955254a971096c120d4ef115a7c6145fb diff --git a/trunk/drivers/firewire/fw-ohci.c b/trunk/drivers/firewire/fw-ohci.c index ab9c01e462ef..9bedd6159f28 100644 --- a/trunk/drivers/firewire/fw-ohci.c +++ b/trunk/drivers/firewire/fw-ohci.c @@ -896,11 +896,11 @@ static void context_stop(struct context *ctx) for (i = 0; i < 10; i++) { reg = reg_read(ctx->ohci, CONTROL_SET(ctx->regs)); if ((reg & CONTEXT_ACTIVE) == 0) - break; + return; - fw_notify("context_stop: still active (0x%08x)\n", reg); mdelay(1); } + fw_error("Error: DMA context still active (0x%08x)\n", reg); } struct driver_data {