[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, stable, updated. upstream/20080903.git2ea34171-31-g9706327

[Andy Green]

The following commit has been merged in the stable branch:
commit 853fcd2329b427788677d11431e6165d108f935b
Author: Matt Hsu <matt_hsu at openmoko.org>
Date:   Wed Sep 17 16:10:43 2008 +0100

    Subject: [PATCH] rework-to-make-USBINS-USBREM-exclusive.patch
    
    This patch is a work-around solution to correct charging indication logic.
    
    Signed-off-by: Matt Hsu <matt_hsu at openmoko.org>

diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
index bac307e..c186fdb 100644
--- a/drivers/i2c/chips/pcf50633.c
+++ b/drivers/i2c/chips/pcf50633.c
@@ -915,7 +915,11 @@ static void pcf50633_work(struct work_struct *work)
 		add_request_to_adc_queue(pcf, PCF50633_ADCC1_MUX_ADCIN1,
 				     PCF50633_ADCC1_AVERAGE_16);
 	}
-	if (pcfirq[0] & PCF50633_INT1_USBREM) {
+	if (pcfirq[0] & PCF50633_INT1_USBREM &&
+				!(pcfirq[0] & PCF50633_INT1_USBINS)) {
+		/* the occurrence of USBINS and USBREM
+		 * should be exclusive in one schedule work
+		 */
 		DEBUGPC("USBREM ");
 
 		pcf->usb_removal_count++;

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko