diff options
| author | Ben Dooks <ben.dooks@codethink.co.uk> | 2015-03-16 11:52:45 +0000 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-03-18 22:41:49 +0530 |
| commit | 75967b788c2898601620ce91ed14b4a9a371b6fe (patch) | |
| tree | 395d247b694ea917bc2bcefb06d08c579c9c69a5 /drivers/dma/pl330.c | |
| parent | 5503aed8117881f58a2688521dfbf9fc7dbcdfe7 (diff) | |
| download | linux-75967b788c2898601620ce91ed14b4a9a371b6fe.tar.gz linux-75967b788c2898601620ce91ed14b4a9a371b6fe.tar.bz2 linux-75967b788c2898601620ce91ed14b4a9a371b6fe.zip | |
dmaengine: pl330: fix return status on pending transfers
The pl330_tx_status() function returns the desc->status if the
dma_cookie_status() call does indicate the cookie completed,
however the desc->status is not look directly compatible. Sparse
throws the following warning:
pl330.c:2262:35: warning: mixing different enum types
pl330.c:2262:35: int enum desc_status versus
pl330.c:2262:35: int enum dma_status
Attempt to fix this by adding a switch statement to turn the
desc->status into a dma_status.
Note, this has only been tested with the dmatest suite.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
--
Vinod Koul <vinod.koul@intel.com>
Dan Williams <dan.j.williams@intel.com>
DMA List <dmaengine@vger.kernel.org>
Maxime Ripard <maxime.ripard@free-electrons.com>
Jassi Brar <jassisinghbrar@gmail.com>
Liviu Dudau <Liviu.Dudau@arm.com>
Linux ARM Kernel <linux-arm-kernel@lists.infradead.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/pl330.c')
| -rw-r--r-- | drivers/dma/pl330.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index d6f677e066f7..a7d9d3029b14 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -2259,7 +2259,17 @@ pl330_tx_status(struct dma_chan *chan, dma_cookie_t cookie, transferred = 0; residual += desc->bytes_requested - transferred; if (desc->txd.cookie == cookie) { - ret = desc->status; + switch (desc->status) { + case DONE: + ret = DMA_COMPLETE; + break; + case PREP: + case BUSY: + ret = DMA_IN_PROGRESS; + break; + default: + WARN_ON(1); + } break; } if (desc->last) |