summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-24 14:45:39 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-24 18:34:08 +0000
commite8b8f5ef90b934bc9eaef7c8960ecd9dda9f7a62 (patch)
tree7a8e9cd4549373c17856535ee222ecd694b3848c /arch
parent382b4480ff832e472d76c99f3f75fffb30e118c0 (diff)
downloadlinux-3.10-e8b8f5ef90b934bc9eaef7c8960ecd9dda9f7a62.tar.gz
linux-3.10-e8b8f5ef90b934bc9eaef7c8960ecd9dda9f7a62.tar.bz2
linux-3.10-e8b8f5ef90b934bc9eaef7c8960ecd9dda9f7a62.zip
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')
-rw-r--r--arch/arm/kernel/dma-isa.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/dma-isa.c b/arch/arm/kernel/dma-isa.c
index 0e88e46fc73..360bb6d701f 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");
}
}