Skip to content

Commit

Permalink
ARM: dma-isa: request cascade channel after registering it
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Russell King committed Dec 24, 2009
1 parent 382b448 commit e8b8f5e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/kernel/dma-isa.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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");
}
}

0 comments on commit e8b8f5e

Please sign in to comment.