summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorRong Dian <b38775@freescale.com>2012-07-10 19:23:50 +0800
committerTerry Lv <r65388@freescale.com>2012-07-25 13:10:43 +0800
commit2df3f7a85d2155bbadebe9fd151bc6ca05d7a282 (patch)
tree87e78670c8299e173db2b9b9d76c9721e22fff34 /drivers/power
parentd5cc69817c2432f3cf701fe238143fbeb071161f (diff)
ENGR00216327: battery: fail to update battery voltage with usb charger attached
when usb charger is online, driver also updates battery voltage Signed-off-by: Rong Dian <b38775@freescale.com>
Diffstat (limited to 'drivers/power')
-rwxr-xr-xdrivers/power/sabresd_battery.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/sabresd_battery.c b/drivers/power/sabresd_battery.c
index 94d7e4194f96..1e13ebf899a1 100755
--- a/drivers/power/sabresd_battery.c
+++ b/drivers/power/sabresd_battery.c
@@ -265,7 +265,7 @@ static void max8903_battery_update_status(struct max8903_data *data)
data->voltage_uV = temp_last;
}
}
- if (data->charger_online == 1) {
+ if (data->charger_online == 1 || data->usb_charger_online == 1) {
data->voltage_uV = temp;
temp_last = temp;
}