diff --git a/[refs] b/[refs] index 1bd5b34897b3..6fb7d421ad2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63b98080daa35f0d682db04f4fb7ada010888752 +refs/heads/master: e1ed7ac77b63abb6b3a2c0b4b070f50da5b1fb2f diff --git a/trunk/kernel/irq/resend.c b/trunk/kernel/irq/resend.c index 872f91ba2ce8..35f10f7ff94a 100644 --- a/trunk/kernel/irq/resend.c +++ b/trunk/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)) {