summaryrefslogtreecommitdiffstats
path: root/drivers/dma/ioat/dma_v2.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2010-03-03 21:22:21 -0700
committerDan Williams <dan.j.williams@intel.com>2010-03-03 21:22:21 -0700
commitdd58ffcf5a5352fc10820c8ffbcd5fed416a2c3a (patch)
treef36172b40f9f3fc2c646f70da40e01705399b6b8 /drivers/dma/ioat/dma_v2.c
parentaa4d72ae946a4fa40486b871717778734184fa29 (diff)
parent56a5d3cf21c71963c8fc506e9b9d3f71641d9c71 (diff)
Merge branch 'coh' into dmaengine
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 25a3c72b294..1ed5d66d7dc 100644
--- a/drivers/dma/ioat/dma_v2.c
+++ b/drivers/dma/ioat/dma_v2.c
@@ -241,7 +241,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;
}