diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2015-10-14 14:42:43 +0300 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-10-14 19:55:34 +0530 |
| commit | 696d8b70c09dd421c4d037fab04341e5b30585cf (patch) | |
| tree | 109140de099ba4f2f4632e8c0f68e6cafe14fd8f /arch/arm/common | |
| parent | 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff) | |
| download | linux-696d8b70c09dd421c4d037fab04341e5b30585cf.tar.gz linux-696d8b70c09dd421c4d037fab04341e5b30585cf.tar.bz2 linux-696d8b70c09dd421c4d037fab04341e5b30585cf.zip | |
ARM: common: edma: Fix channel parameter for irq callbacks
In case when the interrupt happened for the second eDMA the channel
number was incorrectly passed to the client driver.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
CC: <stable@vger.kernel.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'arch/arm/common')
| -rw-r--r-- | arch/arm/common/edma.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c index 873dbfcc7dc9..56fc339571f9 100644 --- a/arch/arm/common/edma.c +++ b/arch/arm/common/edma.c @@ -406,7 +406,8 @@ 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, EDMA_DMA_COMPLETE, + EDMA_CTLR_CHAN(ctlr, channel), + EDMA_DMA_COMPLETE, edma_cc[ctlr]->intr_data[channel].data); } } while (sh_ipr); @@ -460,7 +461,8 @@ static irqreturn_t dma_ccerr_handler(int irq, void *data) if (edma_cc[ctlr]->intr_data[k]. callback) { edma_cc[ctlr]->intr_data[k]. - callback(k, + callback( + EDMA_CTLR_CHAN(ctlr, k), EDMA_DMA_CC_ERROR, edma_cc[ctlr]->intr_data [k].data); |