]> git.karo-electronics.de Git - linux-beck.git/commitdiff
mfd: ucb1x00: Allow IRQ probing to work with IRQs > 32
authorRussell King <rmk+kernel@armlinux.org.uk>
Tue, 30 Aug 2016 11:00:25 +0000 (12:00 +0100)
committerLee Jones <lee.jones@linaro.org>
Tue, 4 Oct 2016 14:48:02 +0000 (15:48 +0100)
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>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/ucb1x00-core.c

index 9ab9ec47ea755d63a2bcd10a8113c4d464b27b59..48bea5038654884951c54917ad30d4ab27fe1431 100644 (file)
@@ -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.