diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-03-03 23:22:21 -0500 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-03-03 23:22:21 -0500 |
| commit | dd58ffcf5a5352fc10820c8ffbcd5fed416a2c3a (patch) | |
| tree | f36172b40f9f3fc2c646f70da40e01705399b6b8 /drivers/dma/ioat | |
| parent | aa4d72ae946a4fa40486b871717778734184fa29 (diff) | |
| parent | 56a5d3cf21c71963c8fc506e9b9d3f71641d9c71 (diff) | |
Merge branch 'coh' into dmaengine
Diffstat (limited to 'drivers/dma/ioat')
| -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) | |||
| 241 | if (is_ioat_active(status) || is_ioat_idle(status)) | 241 | if (is_ioat_active(status) || is_ioat_idle(status)) |
| 242 | ioat_suspend(chan); | 242 | ioat_suspend(chan); |
| 243 | while (is_ioat_active(status) || is_ioat_idle(status)) { | 243 | while (is_ioat_active(status) || is_ioat_idle(status)) { |
| 244 | if (end && time_after(jiffies, end)) { | 244 | if (tmo && time_after(jiffies, end)) { |
| 245 | err = -ETIMEDOUT; | 245 | err = -ETIMEDOUT; |
| 246 | break; | 246 | break; |
| 247 | } | 247 | } |