Merge git://git.infradead.org/battery-2.6

[linux-2.6-omap-h63xx.git] / arch / mips / pmc-sierra / msp71xx / msp_hwbutton.c

diff --git a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
index 6fa85728158b64ea52ca1caa477cfd8bf7d70af9..11769b55438c27da2c113da9d21c39e21affa31e 100644 (file)
--- a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
@@ -126,9 +126,6 @@ static irqreturn_t hwbutton_handler(int irq, void *data)
        struct hwbutton_interrupt *hirq = data;
        unsigned long cic_ext = *CIC_EXT_CFG_REG;
 
-       if (irq != hirq->irq)
-               return IRQ_NONE;
-
        if (CIC_EXT_IS_ACTIVE_HI(cic_ext, hirq->eirq)) {
                /* Interrupt: pin is now HI */
                CIC_EXT_SET_ACTIVE_LO(cic_ext, hirq->eirq);
@@ -163,8 +160,8 @@ static int msp_hwbutton_register(struct hwbutton_interrupt *hirq)
                CIC_EXT_SET_ACTIVE_HI(cic_ext, hirq->eirq);
        *CIC_EXT_CFG_REG = cic_ext;
 
-       return request_irq(hirq->irq, hwbutton_handler, SA_INTERRUPT,
-                               hirq->name, (void *)hirq);
+       return request_irq(hirq->irq, hwbutton_handler, IRQF_DISABLED,
+                          hirq->name, hirq);
 }
 
 static int __init msp_hwbutton_setup(void)