Commit f2292532 authored by Martin Fuzzey's avatar Martin Fuzzey Committed by Sascha Hauer
Browse files

mxc : BUG in imx_dma_request



On MX2 platforms imx_dma_request() calls request_irq() which may sleep
with interrupts disabled.
Signed-off-by: default avatarMartin Fuzzey <mfuzzey@gmail.com>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent de0096d8
...@@ -693,12 +693,15 @@ int imx_dma_request(int channel, const char *name) ...@@ -693,12 +693,15 @@ int imx_dma_request(int channel, const char *name)
local_irq_restore(flags); local_irq_restore(flags);
return -EBUSY; return -EBUSY;
} }
memset(imxdma, 0, sizeof(imxdma));
imxdma->name = name;
local_irq_restore(flags); /* request_irq() can block */
#ifdef CONFIG_ARCH_MX2 #ifdef CONFIG_ARCH_MX2
ret = request_irq(MXC_INT_DMACH0 + channel, dma_irq_handler, 0, "DMA", ret = request_irq(MXC_INT_DMACH0 + channel, dma_irq_handler, 0, "DMA",
NULL); NULL);
if (ret) { if (ret) {
local_irq_restore(flags); imxdma->name = NULL;
printk(KERN_CRIT "Can't register IRQ %d for DMA channel %d\n", printk(KERN_CRIT "Can't register IRQ %d for DMA channel %d\n",
MXC_INT_DMACH0 + channel, channel); MXC_INT_DMACH0 + channel, channel);
return ret; return ret;
...@@ -708,13 +711,6 @@ int imx_dma_request(int channel, const char *name) ...@@ -708,13 +711,6 @@ int imx_dma_request(int channel, const char *name)
imxdma->watchdog.data = channel; imxdma->watchdog.data = channel;
#endif #endif
imxdma->name = name;
imxdma->irq_handler = NULL;
imxdma->err_handler = NULL;
imxdma->data = NULL;
imxdma->sg = NULL;
local_irq_restore(flags);
return ret; return ret;
} }
EXPORT_SYMBOL(imx_dma_request); EXPORT_SYMBOL(imx_dma_request);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment