diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-25 12:31:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-25 12:31:59 -0400 |
commit | d5adf235adc8d8d67c10afd43922c92753f6be3c (patch) | |
tree | 18c3cdcbc9a50a8cd00b03d83ec76bad7c7594f8 /drivers/dma/coh901318.c | |
parent | d484864dd96e1830e7689510597707c1df8cd681 (diff) | |
parent | 1dd1ea8eb46a71201943148cc0ed3182cd04e288 (diff) |
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine updates from Vinod Koul:
"Nothing exciting this time, odd fixes in a bunch of drivers"
* 'next' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: at_hdmac: take maxburst from slave configuration
dmaengine: at_hdmac: remove ATC_DEFAULT_CTRLA constant
dmaengine: at_hdmac: remove some at_dma_slave comments
dma: imx-sdma: make channel0 operations atomic
dmaengine: Fixup dmaengine_prep_slave_single() to be actually useful
dmaengine: Use dma_sg_len(sg) instead of sg->length
dmaengine: Use sg_dma_address instead of sg_phys
DMA: PL330: Remove duplicate header file inclusion
dma: imx-sdma: keep the callbacks invoked in the tasklet
dmaengine: dw_dma: add Device Tree probing capability
dmaengine: dw_dmac: Add clk_{un}prepare() support
dma/amba-pl08x: add support for the Nomadik variant
dma/amba-pl08x: check for terminal count status only
Diffstat (limited to 'drivers/dma/coh901318.c')
-rw-r--r-- | drivers/dma/coh901318.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c index 750925f9638..e67b4e06a91 100644 --- a/drivers/dma/coh901318.c +++ b/drivers/dma/coh901318.c | |||
@@ -1033,7 +1033,7 @@ coh901318_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, | |||
1033 | 1033 | ||
1034 | if (!sgl) | 1034 | if (!sgl) |
1035 | goto out; | 1035 | goto out; |
1036 | if (sgl->length == 0) | 1036 | if (sg_dma_len(sgl) == 0) |
1037 | goto out; | 1037 | goto out; |
1038 | 1038 | ||
1039 | spin_lock_irqsave(&cohc->lock, flg); | 1039 | spin_lock_irqsave(&cohc->lock, flg); |