From: Vernon Sauder <vernoninhand@gmail.com>
Date: Mon, 21 Apr 2008 16:13:21 +0000 (-0400)
Subject: Input: ucb1400_ts - IRQ probe fix
X-Git-Tag: v2.6.26-rc1~1062^2^2~2
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=48bdce4a2e0b1d3be6ed6da14d25adfe9385d2dc;hp=a22b4b2f408f7958ffb3a9e62defc5168db1e15e;p=~andy%2Flinux

Input: ucb1400_ts - IRQ probe fix

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>
---

diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c
index 607f9933aa1..bce018e45bc 100644
--- a/drivers/input/touchscreen/ucb1400_ts.c
+++ b/drivers/input/touchscreen/ucb1400_ts.c
@@ -427,10 +427,6 @@ static int ucb1400_detect_irq(struct ucb1400 *ucb)
 	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);