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

Commit ec64152f authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Russell King
Browse files

[ARM] 3530/1: PXA Mainstone: prevent double enable_irq() in pcmcia 



Patch from Thomas Gleixner

The mainstone board pcmcia interrupt have been enabled via setup_irq()
and the following socket check calls enable_irq again. Set the NOAUTOEN flag so the interrupt is not automatically enabled in setup_irq()

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarNicolas Pitre <nico@cam.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c3fb0416

arch/arm/mach-pxa/mainstone.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -95,6 +95,9 @@ static void __init mainstone_init_irq(void) 
	for(irq = MAINSTONE_IRQ(0); irq <= MAINSTONE_IRQ(15); irq++) {

	for(irq = MAINSTONE_IRQ(0); irq <= MAINSTONE_IRQ(15); irq++) {

		set_irq_chip(irq, &mainstone_irq_chip);

		set_irq_chip(irq, &mainstone_irq_chip);

		set_irq_handler(irq, do_level_IRQ);

		set_irq_handler(irq, do_level_IRQ);

		if (irq == MAINSTONE_IRQ(10) || irq == MAINSTONE_IRQ(14))

			set_irq_flags(irq, IRQF_VALID | IRQF_PROBE | IRQF_NOAUTOEN);

		else

			set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

			set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

	}

	}

	set_irq_flags(MAINSTONE_IRQ(8), 0);

	set_irq_flags(MAINSTONE_IRQ(8), 0);