summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-17 11:46:26 -0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-17 11:46:26 -0200
commitaa1b052a34d7ec85b23f4fba564df24b9477201b (patch)
tree904f0ede7a80b9c8e6e341bfb5d72b8731767d24 /kernel
parentbd29e568a4cb6465f6e5ec7c1c1f3ae7d99cbec1 (diff)
parentc75d720fca8a91ce99196d33adea383621027bf2 (diff)
downloadblackbird-op-linux-aa1b052a34d7ec85b23f4fba564df24b9477201b.tar.gz
blackbird-op-linux-aa1b052a34d7ec85b23f4fba564df24b9477201b.zip
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
Diffstat (limited to 'kernel')
-rw-r--r--kernel/irq/spurious.c2
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)
struct irq_desc *desc;
int i, ok = 0;
- if (atomic_inc_return(&irq_poll_active) == 1)
+ if (atomic_inc_return(&irq_poll_active) != 1)
goto out;
irq_poll_cpu = smp_processor_id();
OpenPOWER on IntegriCloud