diff options
Diffstat (limited to 'arch/arm/mach-imx/dma-v1.c')
-rw-r--r-- | arch/arm/mach-imx/dma-v1.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/dma-v1.c b/arch/arm/mach-imx/dma-v1.c index 3e8c47c63bac..236f1495efad 100644 --- a/arch/arm/mach-imx/dma-v1.c +++ b/arch/arm/mach-imx/dma-v1.c | |||
@@ -699,7 +699,7 @@ int imx_dma_request(int channel, const char *name) | |||
699 | local_irq_restore(flags); | 699 | local_irq_restore(flags); |
700 | return -EBUSY; | 700 | return -EBUSY; |
701 | } | 701 | } |
702 | memset(imxdma, 0, sizeof(imxdma)); | 702 | memset(imxdma, 0, sizeof(*imxdma)); |
703 | imxdma->name = name; | 703 | imxdma->name = name; |
704 | local_irq_restore(flags); /* request_irq() can block */ | 704 | local_irq_restore(flags); /* request_irq() can block */ |
705 | 705 | ||
@@ -818,9 +818,11 @@ static int __init imx_dma_init(void) | |||
818 | imx_dmav1_baseaddr = MX27_IO_ADDRESS(MX27_DMA_BASE_ADDR); | 818 | imx_dmav1_baseaddr = MX27_IO_ADDRESS(MX27_DMA_BASE_ADDR); |
819 | else | 819 | else |
820 | #endif | 820 | #endif |
821 | BUG(); | 821 | return 0; |
822 | 822 | ||
823 | dma_clk = clk_get(NULL, "dma"); | 823 | dma_clk = clk_get(NULL, "dma"); |
824 | if (IS_ERR(dma_clk)) | ||
825 | return PTR_ERR(dma_clk); | ||
824 | clk_enable(dma_clk); | 826 | clk_enable(dma_clk); |
825 | 827 | ||
826 | /* reset DMA module */ | 828 | /* reset DMA module */ |