]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Nov 2011 13:46:26 +0000 (11:46 -0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Nov 2011 13:46:26 +0000 (11:46 -0200)
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq: Fix irqfixup, irqpoll regression

kernel/irq/spurious.c

index aa57d5da18c1de65e807098702ad9b841fa3788d..b5f4742693c01f2d0c286af36de1434a0436ff41 100644 (file)
@@ -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();