From b9378eeda09c04ad8ea45ef79a30e78261a0d164 Mon Sep 17 00:00:00 2001 From: Martin Fuzzey Date: Thu, 26 Mar 2009 22:27:52 +0100 Subject: [PATCH] --- yaml --- r: 144669 b: refs/heads/master c: f2292532a5f0cf6359adca349cdd2a0150581937 h: refs/heads/master i: 144667: 81934ddbd6c7587cbde217b4886fe291878b346c v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-mxc/dma-mx1-mx2.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 743b417698c4..46c7df9dddbf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de0096d80980e26fab16ac3eff57f47fadad92cb +refs/heads/master: f2292532a5f0cf6359adca349cdd2a0150581937 diff --git a/trunk/arch/arm/plat-mxc/dma-mx1-mx2.c b/trunk/arch/arm/plat-mxc/dma-mx1-mx2.c index a9126ed7935a..77646436c00e 100644 --- a/trunk/arch/arm/plat-mxc/dma-mx1-mx2.c +++ b/trunk/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);