diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 18:22:30 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 18:27:56 +0530 |
| commit | db60d8da8f643586c95f8fc3e383954f8c57f1f3 (patch) | |
| tree | be686ebbfd8b0f9a2a87ae7b10ed1207afb64254 /arch | |
| parent | 7db5f7274a0b065abdc358be2a44b4a911d75707 (diff) | |
| download | linux-db60d8da8f643586c95f8fc3e383954f8c57f1f3.tar.gz linux-db60d8da8f643586c95f8fc3e383954f8c57f1f3.tar.bz2 linux-db60d8da8f643586c95f8fc3e383954f8c57f1f3.zip | |
dmanengine: fix edma driver to not define DMA_COMPLETE
edma header defines DMA_COMPLETE, this causes issues as commit adfedd9a32e4 move
DMA_SUCCESS to DMA_COMPLETE. edma should properly namespace its defines and
needs a future fix
Reported-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/common/edma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c index 8e1a0245907f..41bca32409fc 100644 --- a/arch/arm/common/edma.c +++ b/arch/arm/common/edma.c @@ -404,7 +404,7 @@ static irqreturn_t dma_irq_handler(int irq, void *data) BIT(slot)); if (edma_cc[ctlr]->intr_data[channel].callback) edma_cc[ctlr]->intr_data[channel].callback( - channel, DMA_COMPLETE, + channel, EDMA_DMA_COMPLETE, edma_cc[ctlr]->intr_data[channel].data); } } while (sh_ipr); @@ -459,7 +459,7 @@ static irqreturn_t dma_ccerr_handler(int irq, void *data) callback) { edma_cc[ctlr]->intr_data[k]. callback(k, - DMA_CC_ERROR, + EDMA_DMA_CC_ERROR, edma_cc[ctlr]->intr_data [k].data); } |