Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / kernel / irq / spurious.c

diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index 5707f97a3e6ac50954f8d407d5a4aadcaa2b96fc..061ba7eed4edf77249b0a99df771e3f6d0dc26e0 100644 (file)
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -175,7 +175,9 @@ static void poll_spurious_irqs(unsigned long dummy)
 
 static inline int bad_action_ret(irqreturn_t action_ret)
 {
-       if (likely(action_ret <= (IRQ_HANDLED | IRQ_WAKE_THREAD)))
+       unsigned int r = action_ret;
+
+       if (likely(r <= (IRQ_HANDLED | IRQ_WAKE_THREAD)))
                return 0;
        return 1;
 }