diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-17 08:46:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-17 08:46:26 -0500 |
| commit | aa1b052a34d7ec85b23f4fba564df24b9477201b (patch) | |
| tree | 904f0ede7a80b9c8e6e341bfb5d72b8731767d24 | |
| parent | bd29e568a4cb6465f6e5ec7c1c1f3ae7d99cbec1 (diff) | |
| parent | c75d720fca8a91ce99196d33adea383621027bf2 (diff) | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
genirq: Fix irqfixup, irqpoll regression
| -rw-r--r-- | kernel/irq/spurious.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index aa57d5da18c1..b5f4742693c0 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c | |||
| @@ -115,7 +115,7 @@ static int misrouted_irq(int irq) | |||
| 115 | struct irq_desc *desc; | 115 | struct irq_desc *desc; |
| 116 | int i, ok = 0; | 116 | int i, ok = 0; |
| 117 | 117 | ||
| 118 | if (atomic_inc_return(&irq_poll_active) == 1) | 118 | if (atomic_inc_return(&irq_poll_active) != 1) |
| 119 | goto out; | 119 | goto out; |
| 120 | 120 | ||
| 121 | irq_poll_cpu = smp_processor_id(); | 121 | irq_poll_cpu = smp_processor_id(); |