Skip to contentSkip to conversation

Patch "ARM: common: edma: Fix channel parameter for irq callbacks" has been added to the 4.3-stable tree

PATCH [email protected] 1 participant 1 message Dec 6, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ARM: common: edma: Fix channel parameter for irq callbacks

to the 4.3-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arm-common-edma-fix-channel-parameter-for-irq-callbacks.patch
and it can be found in the queue-4.3 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 696d8b70c09dd421c4d037fab04341e5b30585cf Mon Sep 17 00:00:00 2001

From: Peter Ujfalusi <[email protected]>
Date: Wed, 14 Oct 2015 14:42:43 +0300
Subject: ARM: common: edma: Fix channel parameter for irq callbacks

From: Peter Ujfalusi <[email protected]>

commit 696d8b70c09dd421c4d037fab04341e5b30585cf upstream.

In case when the interrupt happened for the second eDMA the channel number was incorrectly passed to the client driver.

---
 arch/arm/common/edma.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm/common/edma.c +4 -2
@@ -406,7 +406,8 @@ static irqreturn_t dma_irq_handler(int i
 					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
 					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);

Patches currently in stable-queue which might be from [email protected] are

queue-4.3/arm-common-edma-fix-channel-parameter-for-irq-callbacks.patch