ieee1394: merge from Linus

[mv-sheeva.git] / kernel / irq / resend.c

diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c
index 872f91ba2ce89f414450550c3287e20a758ec474..35f10f7ff94aec43957fa71e7e97cf8f67b22b73 100644 (file)
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@ -63,8 +63,7 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq)
        desc->chip->enable(irq);
 
        if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
-               desc->status &= ~IRQ_PENDING;
-               desc->status = status | IRQ_REPLAY;
+               desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY;
 
                if (!desc->chip || !desc->chip->retrigger ||
                                        !desc->chip->retrigger(irq)) {