]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Input: ucb1400_ts - IRQ probe fix
authorVernon Sauder <vernoninhand@gmail.com>
Mon, 21 Apr 2008 16:13:21 +0000 (12:13 -0400)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 24 Apr 2008 17:25:24 +0000 (13:25 -0400)
The UCB1400 driver IRQ probe code fails to find an interrupt if all
the interrupts in the range 0-31 are nonprobe-able. This patch
removes the check of the return value so interrupts above 31 can be
detected.

Tested on InHand Fingertip4 PXA270 board.

Signed-off-by: Vernon Sauder <vsauder@inhand.com>
Acked-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
drivers/input/touchscreen/ucb1400_ts.c

index 607f9933aa1fd6d91f423fd62e821b17dc243b1d..bce018e45bce4781cb7b61519485502ff8c22171 100644 (file)
@@ -427,10 +427,6 @@ static int ucb1400_detect_irq(struct ucb1400 *ucb)
        unsigned long mask, timeout;
 
        mask = probe_irq_on();
        unsigned long mask, timeout;
 
        mask = probe_irq_on();
-       if (!mask) {
-               probe_irq_off(mask);
-               return -EBUSY;
-       }
 
        /* Enable the ADC interrupt. */
        ucb1400_reg_write(ucb, UCB_IE_RIS, UCB_IE_ADC);
 
        /* Enable the ADC interrupt. */
        ucb1400_reg_write(ucb, UCB_IE_RIS, UCB_IE_ADC);