summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2013-10-31 22:36:01 +0530
committerVinod Koul <vinod.koul@intel.com>2013-10-31 22:36:01 +0530
commitf8d9f628e1f16939ebc181a8f3f8ed31af4aee00 (patch)
treea1d547bf427dd09a774815424a98d39dfb20ea3c /arch/arm
parentf0dad6e701cb66301287074c39183c7312139530 (diff)
parentdb60d8da8f643586c95f8fc3e383954f8c57f1f3 (diff)
downloadop-kernel-dev-f8d9f628e1f16939ebc181a8f3f8ed31af4aee00.zip
op-kernel-dev-f8d9f628e1f16939ebc181a8f3f8ed31af4aee00.tar.gz
Merge branch 'dma_complete' into next
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/common/edma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
index 8e1a024..41bca32 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);
}
OpenPOWER on IntegriCloud