Browse Source

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>
Russell King 15 years ago
parent
commit
e8b8f5ef90
1 changed files with 2 additions and 2 deletions
  1. 2 2
      arch/arm/kernel/dma-isa.c

+ 2 - 2
arch/arm/kernel/dma-isa.c

@@ -207,8 +207,6 @@ void __init isa_init_dma(void)
 		outb(0x32, 0x4d6);
 		outb(0x32, 0x4d6);
 		outb(0x33, 0x4d6);
 		outb(0x33, 0x4d6);
 
 
-		request_dma(DMA_ISA_CASCADE, "cascade");
-
 		for (i = 0; i < ARRAY_SIZE(dma_resources); i++)
 		for (i = 0; i < ARRAY_SIZE(dma_resources); i++)
 			request_resource(&ioport_resource, 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",
 				printk(KERN_ERR "ISADMA%u: unable to register: %d\n",
 					chan, ret);
 					chan, ret);
 		}
 		}
+
+		request_dma(DMA_ISA_CASCADE, "cascade");
 	}
 	}
 }
 }