diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-10-31 13:06:01 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-10-31 13:06:01 -0400 |
| commit | f8d9f628e1f16939ebc181a8f3f8ed31af4aee00 (patch) | |
| tree | a1d547bf427dd09a774815424a98d39dfb20ea3c /arch/arm | |
| parent | f0dad6e701cb66301287074c39183c7312139530 (diff) | |
| parent | db60d8da8f643586c95f8fc3e383954f8c57f1f3 (diff) | |
Merge branch 'dma_complete' into next
Diffstat (limited to 'arch/arm')
| -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 | } |