From: Peter Tyser <ptyser@xes-inc.com>
Date: Tue, 30 Jun 2009 22:15:44 +0000 (-0500)
Subject: fsl_dma: Fix Channel Start bug in dma_check()
X-Git-Tag: v2009.08-rc1~122^2~12
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=484919cf3351212ebf748b9b13ece1ddaf7e7d1c;p=oweals%2Fu-boot.git

fsl_dma: Fix Channel Start bug in dma_check()

The Channel Start (CS) bit in the Mode Register (MR) should actually be
cleared as the comment in the code suggests.  Previously, CS was being
set, not cleared.

Assuming normal operation of the DMA engine, this change shouldn't have
any real affect.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---

diff --git a/drivers/dma/fsl_dma.c b/drivers/dma/fsl_dma.c
index f3575af6d7..f05880230b 100644
--- a/drivers/dma/fsl_dma.c
+++ b/drivers/dma/fsl_dma.c
@@ -60,7 +60,7 @@ static uint dma_check(void) {
 	} while (status & FSL_DMA_SR_CB);
 
 	/* clear MR[CS] channel start bit */
-	out_be32(&dma->mr, in_be32(&dma->mr) & FSL_DMA_MR_CS);
+	out_be32(&dma->mr, in_be32(&dma->mr) & ~FSL_DMA_MR_CS);
 	dma_sync();
 
 	if (status != 0)