Commit cfc73656 authored by Ingo Molnar's avatar Ingo Molnar Committed by Russell King

[ARM] fix drivers/mfd/ucb1x00-core.c IRQ probing bug

While reviewing the IRQ autoprobing code i found the attached buglet.
probe_irq_on()/off() calls must always be in pairs, because the generic IRQ
code uses a global semaphore to serialize all autoprobing activites.
(which does make sense) The ARM code's probe_irq_*() implementation does
not do this, but if this driver is ever used on another platform, this bug
might bite.

(It probably does not trigger in practice, because a zero probing mask
returned should be rare - but still.)
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent cd701aa2
...@@ -420,8 +420,10 @@ static int ucb1x00_detect_irq(struct ucb1x00 *ucb) ...@@ -420,8 +420,10 @@ static int ucb1x00_detect_irq(struct ucb1x00 *ucb)
unsigned long mask; unsigned long mask;
mask = probe_irq_on(); mask = probe_irq_on();
if (!mask) if (!mask) {
probe_irq_off(mask);
return NO_IRQ; return NO_IRQ;
}
/* /*
* Enable the ADC interrupt. * Enable the ADC interrupt.
......
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