On Wed, Jan 28, 2009 at 10:32:09AM -0800, Tony Lindgren wrote: > From: 김규원 <chammoru@xxxxxxxxx> > > By Ingo Molnar, interrupts are not masked by default. > (refer to 76d2160147f43f982dfe881404cfde9fd0a9da21) > > But if interrupts are not masked, the processor can wake up while in > Suspend-to-RAM state by an external interrupt. For example, if an > OMAP3 board is connected to Host PC by USB and entered to Suspend-to-RAM > state, it wake up automatically by M_IRQ_92. The disable_irq() function > can't disable the interrupt in H/W level, So I modified > arch/arm/mach-omap2/irq.c > > Signed-off-by: Kim Kyuwon <chammoru@xxxxxxxxx> > Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx> > --- > arch/arm/mach-omap2/irq.c | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c > index 636e282..52772f9 100644 > --- a/arch/arm/mach-omap2/irq.c > +++ b/arch/arm/mach-omap2/irq.c > @@ -123,6 +123,11 @@ static void omap_unmask_irq(unsigned int irq) > intc_bank_write_reg(1 << irq, &irq_banks[0], INTC_MIR_CLEAR0 + offset); > } > > +static void omap_disable_irq(unsigned int irq) > +{ > + omap_mask_irq(irq); > +} > + > static void omap_mask_ack_irq(unsigned int irq) > { > omap_mask_irq(irq); > @@ -134,6 +139,7 @@ static struct irq_chip omap_irq_chip = { > .ack = omap_mask_ack_irq, > .mask = omap_mask_irq, > .unmask = omap_unmask_irq, > + .disable = omap_disable_irq, There's no need for the indirection - omap_mask_irq() already has the required prototype for the .disable function. So this patch should just be adding: .disable = omap_mask_irq, -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html