diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-21 10:18:14 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-21 10:18:14 -0400 |
| commit | 91fa47964165a42401fbc1f41caa63ab78564305 (patch) | |
| tree | 8f4ffdcbdedd845563630c3bcacd9407c75ccb52 /kernel/irq/resend.c | |
| parent | 56965536b8056f57830219efbba4b85218d96d6c (diff) | |
| parent | e478bec0ba0a83a48a0f6982934b6de079e7e6b3 (diff) | |
| download | op-kernel-dev-91fa47964165a42401fbc1f41caa63ab78564305.zip op-kernel-dev-91fa47964165a42401fbc1f41caa63ab78564305.tar.gz | |
Merge branch 'master' into gfs2
Diffstat (limited to 'kernel/irq/resend.c')
| -rw-r--r-- | kernel/irq/resend.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c index 872f91ba..35f10f7 100644 --- 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)) { |
