Commit aa1b052a authored by Linus Torvalds's avatar Linus Torvalds

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
parents bd29e568 c75d720f
...@@ -115,7 +115,7 @@ static int misrouted_irq(int irq) ...@@ -115,7 +115,7 @@ static int misrouted_irq(int irq)
struct irq_desc *desc; struct irq_desc *desc;
int i, ok = 0; int i, ok = 0;
if (atomic_inc_return(&irq_poll_active) == 1) if (atomic_inc_return(&irq_poll_active) != 1)
goto out; goto out;
irq_poll_cpu = smp_processor_id(); irq_poll_cpu = smp_processor_id();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment