diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-24 09:45:39 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-24 13:34:08 -0500 |
commit | e8b8f5ef90b934bc9eaef7c8960ecd9dda9f7a62 (patch) | |
tree | 7a8e9cd4549373c17856535ee222ecd694b3848c /arch/arm/kernel/dma-isa.c | |
parent | 382b4480ff832e472d76c99f3f75fffb30e118c0 (diff) |
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 <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/dma-isa.c')
-rw-r--r-- | arch/arm/kernel/dma-isa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/dma-isa.c b/arch/arm/kernel/dma-isa.c index 0e88e46fc732..360bb6d701f5 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) | |||
207 | outb(0x32, 0x4d6); | 207 | outb(0x32, 0x4d6); |
208 | outb(0x33, 0x4d6); | 208 | outb(0x33, 0x4d6); |
209 | 209 | ||
210 | request_dma(DMA_ISA_CASCADE, "cascade"); | ||
211 | |||
212 | for (i = 0; i < ARRAY_SIZE(dma_resources); i++) | 210 | for (i = 0; i < ARRAY_SIZE(dma_resources); i++) |
213 | request_resource(&ioport_resource, dma_resources + i); | 211 | request_resource(&ioport_resource, dma_resources + i); |
214 | 212 | ||
@@ -218,5 +216,7 @@ void __init isa_init_dma(void) | |||
218 | printk(KERN_ERR "ISADMA%u: unable to register: %d\n", | 216 | printk(KERN_ERR "ISADMA%u: unable to register: %d\n", |
219 | chan, ret); | 217 | chan, ret); |
220 | } | 218 | } |
219 | |||
220 | request_dma(DMA_ISA_CASCADE, "cascade"); | ||
221 | } | 221 | } |
222 | } | 222 | } |