diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-03-04 05:22:21 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-03-04 05:22:21 +0100 |
| commit | dd58ffcf5a5352fc10820c8ffbcd5fed416a2c3a (patch) | |
| tree | f36172b40f9f3fc2c646f70da40e01705399b6b8 /drivers/dma/ioat/dma_v2.c | |
| parent | ioat: cleanup ->timer_fn() and ->cleanup_fn() prototypes (diff) | |
| parent | DMAENGINE: COH 901 318 lli sg offset fix (diff) | |
| download | linux-dd58ffcf5a5352fc10820c8ffbcd5fed416a2c3a.tar.xz linux-dd58ffcf5a5352fc10820c8ffbcd5fed416a2c3a.zip | |
Merge branch 'coh' into dmaengine
Diffstat (limited to 'drivers/dma/ioat/dma_v2.c')
| -rw-r--r-- | drivers/dma/ioat/dma_v2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/ioat/dma_v2.c b/drivers/dma/ioat/dma_v2.c index 25a3c72b2941..1ed5d66d7dca 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; } |