diff options
author | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 08:52:30 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 08:57:56 -0400 |
commit | db60d8da8f643586c95f8fc3e383954f8c57f1f3 (patch) | |
tree | be686ebbfd8b0f9a2a87ae7b10ed1207afb64254 /arch/arm/common | |
parent | 7db5f7274a0b065abdc358be2a44b4a911d75707 (diff) |
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/arm/common')
-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) | |||
404 | BIT(slot)); | 404 | BIT(slot)); |
405 | if (edma_cc[ctlr]->intr_data[channel].callback) | 405 | if (edma_cc[ctlr]->intr_data[channel].callback) |
406 | edma_cc[ctlr]->intr_data[channel].callback( | 406 | edma_cc[ctlr]->intr_data[channel].callback( |
407 | channel, DMA_COMPLETE, | 407 | channel, EDMA_DMA_COMPLETE, |
408 | edma_cc[ctlr]->intr_data[channel].data); | 408 | edma_cc[ctlr]->intr_data[channel].data); |
409 | } | 409 | } |
410 | } while (sh_ipr); | 410 | } while (sh_ipr); |
@@ -459,7 +459,7 @@ static irqreturn_t dma_ccerr_handler(int irq, void *data) | |||
459 | callback) { | 459 | callback) { |
460 | edma_cc[ctlr]->intr_data[k]. | 460 | edma_cc[ctlr]->intr_data[k]. |
461 | callback(k, | 461 | callback(k, |
462 | DMA_CC_ERROR, | 462 | EDMA_DMA_CC_ERROR, |
463 | edma_cc[ctlr]->intr_data | 463 | edma_cc[ctlr]->intr_data |
464 | [k].data); | 464 | [k].data); |
465 | } | 465 | } |