From 55a1a8e8d0d0f1cea22f0d5e23bbe75dfcbf7056 Mon Sep 17 00:00:00 2001 From: Ramakrishna Pallala Date: Fri, 22 Jun 2012 16:44:50 +0530 Subject: [PATCH] MFD/Battery: Fix battery status setting logic for interrupt case BZ: 38168 Right we are setting the battery status to Not Chargring upon certain interrutps without properly(really) checking the charger fault condition. This patch will fix this issue by making sure that we check charger fault case AND interrupt bits. Change-Id: Ia41c5820dd616ca295a0421f8c3894828a173892 Signed-off-by: Ramakrishna Pallala Reviewed-on: http://android.intel.com:8080/53736 Reviewed-by: Tc, Jenny Reviewed-by: Mukherjee, DevapriyaX Reviewed-by: Jena, TapanX Tested-by: Kallappa Manjanna, MadhukumarX Reviewed-by: buildbot Tested-by: buildbot --- drivers/power/intel_mdf_battery.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/power/intel_mdf_battery.c b/drivers/power/intel_mdf_battery.c index 5b8033a..8440d24 100644 --- a/drivers/power/intel_mdf_battery.c +++ b/drivers/power/intel_mdf_battery.c @@ -2301,8 +2301,8 @@ static irqreturn_t msic_battery_thread_handler(int id, void *dev) } /* Check charger Status bits */ - if ((data[0] & ~(MSIC_BATT_CHR_TIMEEXP_MASK)) || - (data[1] & ~(MSIC_BATT_CHR_CHRCMPLT_MASK)) + if (((data[0] & ~(MSIC_BATT_CHR_TIMEEXP_MASK)) || + (data[1] & ~(MSIC_BATT_CHR_CHRCMPLT_MASK))) && is_charger_fault()) { mutex_lock(&mbi->batt_lock); mbi->batt_props.status = POWER_SUPPLY_STATUS_NOT_CHARGING; -- 2.7.4