From: Dan Williams <dan.j.williams@intel.com>
Date: Wed, 13 Jan 2010 20:33:12 +0000 (-0700)
Subject: ioat: fix infinite timeout checking in ioat2_quiesce
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7e55a70c5b9a57c12f49c44b0847c9343d4f54e4;p=openwrt%2Fstaging%2Fblogic.git

ioat: fix infinite timeout checking in ioat2_quiesce

Fix typo in ioat2_quiesce. check 'tmo' is zero, not 'end'.  Also applies
to 2.6.32.3

Cc: <stable@kernel.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---

diff --git a/drivers/dma/ioat/dma_v2.c b/drivers/dma/ioat/dma_v2.c
index 5f7a500e18d0..5cc37afe2bc1 100644
--- a/drivers/dma/ioat/dma_v2.c
+++ b/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;
 		}