diff options
author | Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-13 02:28:12 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-13 02:28:12 -0400 |
commit | 949ff5b8d46b5e3435d21b2651ce3a2599208d44 (patch) | |
tree | c8fac55a7ae33271acb1fc12f5399e5494b97b47 /drivers/dma/iop-adma.c | |
parent | 8867bd508f88eae8b9c54394f17422f49e387b26 (diff) |
dmaengine: fix for cookie changes and merge
Fixed trivial issues in drivers:
drivers/dma/imx-sdma.c
drivers/dma/intel_mid_dma.c
drivers/dma/ioat/dma_v3.c
drivers/dma/iop-adma.c
drivers/dma/sirf-dma.c
drivers/dma/timb_dma.c
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/dma/iop-adma.c')
-rw-r--r-- | drivers/dma/iop-adma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c index 1f3a703ed0e0..4499f88789bc 100644 --- a/drivers/dma/iop-adma.c +++ b/drivers/dma/iop-adma.c | |||
@@ -894,6 +894,7 @@ static enum dma_status iop_adma_status(struct dma_chan *chan, | |||
894 | struct dma_tx_state *txstate) | 894 | struct dma_tx_state *txstate) |
895 | { | 895 | { |
896 | struct iop_adma_chan *iop_chan = to_iop_adma_chan(chan); | 896 | struct iop_adma_chan *iop_chan = to_iop_adma_chan(chan); |
897 | int ret; | ||
897 | 898 | ||
898 | ret = dma_cookie_status(chan, cookie, txstate); | 899 | ret = dma_cookie_status(chan, cookie, txstate); |
899 | if (ret == DMA_SUCCESS) | 900 | if (ret == DMA_SUCCESS) |