From 80f5624e7c20a98402e8b719c43a202268b30642 Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.williams@intel.com>
Date: Wed, 13 Jan 2010 13:33:12 -0700
Subject: [PATCH] --- yaml --- r: 180466 b: refs/heads/master c:
 7e55a70c5b9a57c12f49c44b0847c9343d4f54e4 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/dma/ioat/dma_v2.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e20381424cc1..70819f8d4114 100644
--- 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
index 5f7a500e18d0..5cc37afe2bc1 100644
--- 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;
 		}