From: Russell King Date: Thu, 24 Dec 2009 14:45:39 +0000 (+0000) Subject: ARM: dma-isa: request cascade channel after registering it X-Git-Tag: upstream/snapshot3+hdmi~16011^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e8b8f5ef90b934bc9eaef7c8960ecd9dda9f7a62;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git ARM: dma-isa: request cascade channel after registering it We can't request the cascade channel before it's been registered, so move it afterwards. Signed-off-by: Russell King --- diff --git a/arch/arm/kernel/dma-isa.c b/arch/arm/kernel/dma-isa.c index 0e88e46..360bb6d 100644 --- a/arch/arm/kernel/dma-isa.c +++ b/arch/arm/kernel/dma-isa.c @@ -207,8 +207,6 @@ void __init isa_init_dma(void) outb(0x32, 0x4d6); outb(0x33, 0x4d6); - request_dma(DMA_ISA_CASCADE, "cascade"); - for (i = 0; i < ARRAY_SIZE(dma_resources); i++) request_resource(&ioport_resource, dma_resources + i); @@ -218,5 +216,7 @@ void __init isa_init_dma(void) printk(KERN_ERR "ISADMA%u: unable to register: %d\n", chan, ret); } + + request_dma(DMA_ISA_CASCADE, "cascade"); } }