lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mxc : Clean up properly when imx_dma_free() used without imx_dma_disable()

Browse Source 
The sequence
	imx_dma_request()
	imx_dma_enable()
	imx_dma_free()
left the dma channel in_use mode and did not release the timer.

Signed-off-by: Martin Fuzzey <mfuzzey@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Martin Fuzzey
2009-03-26 22:21:16 +01:00
committed by Sascha Hauer
parent b4348f32da
commit de0096d809
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/plat-mxc/dma-mx1-mx2.c
View File

@@ -737,10 +737,7 @@ void imx_dma_free(int channel)
local_irq_save(flags); local_irq_save(flags);
/* Disable interrupts */ /* Disable interrupts */
__raw_writel(__raw_readl(DMA_BASE + DMA_DIMR) | (1 << channel), imx_dma_disable(channel);
DMA_BASE + DMA_DIMR);
__raw_writel(__raw_readl(DMA_BASE + DMA_CCR(channel)) & ~CCR_CEN,
DMA_BASE + DMA_CCR(channel));
imxdma->name = NULL; imxdma->name = NULL;
#ifdef CONFIG_ARCH_MX2 #ifdef CONFIG_ARCH_MX2