diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-11 22:02:27 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-11 22:02:27 (GMT) |
| commit | 09e65ed298e1d12b82752675ff5b9135860429ff (patch) | |
| tree | 384a60bcf2a8116427899e6784b8891510a9f403 /drivers/dma/coh901318.c | |
| parent | 9883b83d6fb2f87e0eb6c8839325272466041577 (diff) | |
| parent | 734c2992828c66cee3feb21ecd30a6ac44aecc51 (diff) | |
| download | linux-fsl-qoriq-09e65ed298e1d12b82752675ff5b9135860429ff.tar.xz | |
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/coh901318.c')
| -rw-r--r-- | drivers/dma/coh901318.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c index b5f2ee0..64a9372 100644 --- a/drivers/dma/coh901318.c +++ b/drivers/dma/coh901318.c @@ -613,8 +613,6 @@ static void dma_tasklet(unsigned long data) cohd_fin->pending_irqs--; cohc->completed = cohd_fin->desc.cookie; - BUG_ON(cohc->nbr_active_done && cohd_fin == NULL); - if (cohc->nbr_active_done == 0) return; |