summaryrefslogtreecommitdiffstats
path: root/drivers/dma/ioat/dma_v2.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2010-01-13 21:33:12 +0100
committerDan Williams <dan.j.williams@intel.com>2010-02-03 06:57:34 +0100
commit7e55a70c5b9a57c12f49c44b0847c9343d4f54e4 (patch)
treee9ba9f5896d8e97e76894f23641afd3abce5aac4 /drivers/dma/ioat/dma_v2.c
parentdmaengine: fix memleak in dma_async_device_unregister (diff)
downloadlinux-7e55a70c5b9a57c12f49c44b0847c9343d4f54e4.tar.xz
linux-7e55a70c5b9a57c12f49c44b0847c9343d4f54e4.zip
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>
Diffstat (limited to 'drivers/dma/ioat/dma_v2.c')
-rw-r--r--drivers/dma/ioat/dma_v2.c2
1 files changed, 1 insertions, 1 deletions
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;
}