---

yaml --- r: 180466 b: refs/heads/master c: 7e55a70 h: refs/heads/master v: v3
git-mirror · Feb 3, 2010 · 80f5624 · 80f5624
1 parent a2541be
commit 80f5624
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: adef477268ff5ddd0195611dc7e26d7a879fefe1
+refs/heads/master: 7e55a70c5b9a57c12f49c44b0847c9343d4f54e4
diff --git a/trunk/drivers/dma/ioat/dma_v2.c b/trunk/drivers/dma/ioat/dma_v2.c
@@ -249,7 +249,7 @@ int ioat2_quiesce(struct ioat_chan_common *chan, unsigned long tmo)
 	if (is_ioat_active(status) || is_ioat_idle(status))
 		ioat_suspend(chan);
 	while (is_ioat_active(status) || is_ioat_idle(status)) {
-		if (end && time_after(jiffies, end)) {
+		if (tmo && time_after(jiffies, end)) {
 			err = -ETIMEDOUT;
 			break;
 		}