From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vernon Sauder Subject: [PATCH] UCB1400 IRQ Probe fix Date: Wed, 09 Apr 2008 22:37:19 -0400 Message-ID: <47FD7D5F.40800@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from an-out-0708.google.com ([209.85.132.251]:60377 "EHLO an-out-0708.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753370AbYDJChH (ORCPT ); Wed, 9 Apr 2008 22:37:07 -0400 Received: by an-out-0708.google.com with SMTP id d31so640753and.103 for ; Wed, 09 Apr 2008 19:37:06 -0700 (PDT) Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: linux-input@vger.kernel.org Cc: Nicolas Pitre 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. This change may also be useful in drivers/mfd/ucb1x0-core.c but I cannot test that on my hardware. This patch is against 2.6.24.4. Tested on InHand Fingertip4 PXA270 board. Signed-off-by: Vernon Sauder Acked-by: Nicolas Pitre diff -ur linux.orig/drivers/input/touchscreen/ucb1400_ts.c linux.new/drivers/input/touchscreen/ucb1400_ts.c --- linux.orig/drivers/input/touchscreen/ucb1400_ts.c 2008-03-24 14:49:18.000000000 -0400 +++ linux.new/drivers/input/touchscreen/ucb1400_ts.c 2008-04-03 21:40:43.000000000 -0400 @@ -429,10 +429,6 @@ 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);