diff options
| author | Martin Fuzzey <mfuzzey@gmail.com> | 2009-03-26 22:27:52 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-05-05 09:36:36 +0200 |
| commit | f2292532a5f0cf6359adca349cdd2a0150581937 (patch) | |
| tree | c9387dadb67ce0d5548de95824eeab32d277afd9 /arch/arm/plat-mxc/dma-mx1-mx2.c | |
| parent | mxc : Clean up properly when imx_dma_free() used without imx_dma_disable() (diff) | |
| download | linux-f2292532a5f0cf6359adca349cdd2a0150581937.tar.xz linux-f2292532a5f0cf6359adca349cdd2a0150581937.zip | |
mxc : BUG in imx_dma_request
On MX2 platforms imx_dma_request() calls request_irq() which may sleep
with interrupts disabled.
Signed-off-by: Martin Fuzzey <mfuzzey@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/dma-mx1-mx2.c')
| -rw-r--r-- | arch/arm/plat-mxc/dma-mx1-mx2.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/plat-mxc/dma-mx1-mx2.c b/arch/arm/plat-mxc/dma-mx1-mx2.c index a9126ed7935a..77646436c00e 100644 --- a/arch/arm/plat-mxc/dma-mx1-mx2.c +++ b/arch/arm/plat-mxc/dma-mx1-mx2.c @@ -693,12 +693,15 @@ int imx_dma_request(int channel, const char *name) local_irq_restore(flags); return -EBUSY; } + memset(imxdma, 0, sizeof(imxdma)); + imxdma->name = name; + local_irq_restore(flags); /* request_irq() can block */ #ifdef CONFIG_ARCH_MX2 ret = request_irq(MXC_INT_DMACH0 + channel, dma_irq_handler, 0, "DMA", NULL); if (ret) { - local_irq_restore(flags); + imxdma->name = NULL; printk(KERN_CRIT "Can't register IRQ %d for DMA channel %d\n", MXC_INT_DMACH0 + channel, channel); return ret; @@ -708,13 +711,6 @@ int imx_dma_request(int channel, const char *name) imxdma->watchdog.data = channel; #endif - imxdma->name = name; - imxdma->irq_handler = NULL; - imxdma->err_handler = NULL; - imxdma->data = NULL; - imxdma->sg = NULL; - - local_irq_restore(flags); return ret; } EXPORT_SYMBOL(imx_dma_request); |