projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
382b448
)
ARM: dma-isa: request cascade channel after registering it
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 24 Dec 2009 14:45:39 +0000
(14:45 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 24 Dec 2009 18:34:08 +0000
(18:34 +0000)
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>
arch/arm/kernel/dma-isa.c
patch
|
blob
|
history
diff --git
a/arch/arm/kernel/dma-isa.c
b/arch/arm/kernel/dma-isa.c
index
0e88e46
..
360bb6d
100644
(file)
--- 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");
}
}