| Message ID | E1begmH-0007Hx-Ky@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 30 Aug 2016, Russell King wrote: > probe_irq_on() only returns non-zero if it found any interrupts below > IRQ32 which could be probe candidates. If all the probable interrupts > are higher than 32, then this will cause a failure. Fix this. > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> > --- > drivers/mfd/ucb1x00-core.c | 4 ---- > 1 file changed, 4 deletions(-) Sounds reasonable. Will fix the $SUBJECT line for you. Applied, thanks. > diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c > index 9ab9ec47ea75..48bea5038654 100644 > --- a/drivers/mfd/ucb1x00-core.c > +++ b/drivers/mfd/ucb1x00-core.c > @@ -446,10 +446,6 @@ static int ucb1x00_detect_irq(struct ucb1x00 *ucb) > unsigned long mask; > > mask = probe_irq_on(); > - if (!mask) { > - probe_irq_off(mask); > - return NO_IRQ; > - } > > /* > * Enable the ADC interrupt.
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c index 9ab9ec47ea75..48bea5038654 100644 --- a/drivers/mfd/ucb1x00-core.c +++ b/drivers/mfd/ucb1x00-core.c @@ -446,10 +446,6 @@ static int ucb1x00_detect_irq(struct ucb1x00 *ucb) unsigned long mask; mask = probe_irq_on(); - if (!mask) { - probe_irq_off(mask); - return NO_IRQ; - } /* * Enable the ADC interrupt.
probe_irq_on() only returns non-zero if it found any interrupts below IRQ32 which could be probe candidates. If all the probable interrupts are higher than 32, then this will cause a failure. Fix this. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- drivers/mfd/ucb1x00-core.c | 4 ---- 1 file changed, 4 deletions(-)