diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-11 14:02:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-11 14:02:27 -0800 |
| commit | 09e65ed298e1d12b82752675ff5b9135860429ff (patch) | |
| tree | 384a60bcf2a8116427899e6784b8891510a9f403 /drivers/dma/ioat | |
| parent | 9883b83d6fb2f87e0eb6c8839325272466041577 (diff) | |
| parent | 734c2992828c66cee3feb21ecd30a6ac44aecc51 (diff) | |
| download | blackbird-op-linux-09e65ed298e1d12b82752675ff5b9135860429ff.tar.gz blackbird-op-linux-09e65ed298e1d12b82752675ff5b9135860429ff.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
drivers/dma: Correct NULL test
async-tx: fix buffer submission error handling in ipu_idma.c
dmaengine: correct onstack wait_queue_head declaration
ioat: fix infinite timeout checking in ioat2_quiesce
dmaengine: fix memleak in dma_async_device_unregister
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 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; } |
