aboutsummaryrefslogtreecommitdiff
path: root/drivers/i2c
diff options
context:
space:
mode:
authorMatt Hsu <matt_hsu@openmoko.org>2008-11-19 17:10:53 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-11-19 17:10:53 +0000
commitf8ea545df027f22ddae37468bc652e91456537ae (patch)
tree3a3dbc5cbb4616d6dba36ce1ee097372e7333232 /drivers/i2c
parentebb7c533b351000ceb8c099d5049fc34bf891ec5 (diff)
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@openmoko.org>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/chips/pcf50633.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
index 2dbeecbe700..58f85d2ba58 100644
--- a/drivers/i2c/chips/pcf50633.c
+++ b/drivers/i2c/chips/pcf50633.c
@@ -914,7 +914,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++;