diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-28 06:49:56 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-28 06:49:56 -0500 |
| commit | 9ee4be4156b1a507f199e750ba2c13ffb6ea9b42 (patch) | |
| tree | c92cb39ad1f0be559390c2a995d9aad2b0300b14 /kernel/irq/spurious.c | |
| parent | 005d610f2abc550172726b997f5cfe683769cc1c (diff) | |
| parent | d4d6373c1109b11c8118340be97ae31b8f94d66a (diff) | |
Merge remote-tracking branch 'regulator/for-linus' into regulator-next
Diffstat (limited to 'kernel/irq/spurious.c')
| -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(); |