summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2013-10-30 18:22:30 +0530
committerVinod Koul <vinod.koul@intel.com>2013-10-30 18:27:56 +0530
commitdb60d8da8f643586c95f8fc3e383954f8c57f1f3 (patch)
treebe686ebbfd8b0f9a2a87ae7b10ed1207afb64254 /drivers/dma
parent7db5f7274a0b065abdc358be2a44b4a911d75707 (diff)
downloadblackbird-op-linux-db60d8da8f643586c95f8fc3e383954f8c57f1f3.tar.gz
blackbird-op-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 'drivers/dma')
-rw-r--r--drivers/dma/edma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index 29fa35807f09..cb69f3a674e0 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -407,7 +407,7 @@ static void edma_callback(unsigned ch_num, u16 ch_status, void *data)
edma_pause(echan->ch_num);
switch (ch_status) {
- case DMA_COMPLETE:
+ case EDMA_DMA_COMPLETE:
spin_lock_irqsave(&echan->vchan.lock, flags);
edesc = echan->edesc;
@@ -426,7 +426,7 @@ static void edma_callback(unsigned ch_num, u16 ch_status, void *data)
spin_unlock_irqrestore(&echan->vchan.lock, flags);
break;
- case DMA_CC_ERROR:
+ case EDMA_DMA_CC_ERROR:
spin_lock_irqsave(&echan->vchan.lock, flags);
edma_read_slot(EDMA_CHAN_SLOT(echan->slot[0]), &p);
OpenPOWER on IntegriCloud