diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-10-31 21:06:01 +0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-10-31 21:06:01 +0400 |
| commit | f8d9f628e1f16939ebc181a8f3f8ed31af4aee00 (patch) | |
| tree | a1d547bf427dd09a774815424a98d39dfb20ea3c /drivers/dma/edma.c | |
| parent | f0dad6e701cb66301287074c39183c7312139530 (diff) | |
| parent | db60d8da8f643586c95f8fc3e383954f8c57f1f3 (diff) | |
| download | linux-f8d9f628e1f16939ebc181a8f3f8ed31af4aee00.tar.xz | |
Merge branch 'dma_complete' into next
Diffstat (limited to 'drivers/dma/edma.c')
| -rw-r--r-- | drivers/dma/edma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 5dce96af9c46..183ec85cb6ca 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -471,7 +471,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; @@ -490,7 +490,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); |