Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8b8f5ef authored by Russell King's avatar Russell King
Browse files

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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 382b4480

arch/arm/kernel/dma-isa.c

+2 −2
Original line number Diff line number Diff line
@@ -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");

	}

}