commit 52e66c3a6c8757a61b0b2199d13eabbfb6553db0
author Linux Build Service Account <lnxbuild@localhost> Wed Apr 25 09:02:50 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Wed Apr 25 09:02:50 2012 -0700
tree 3851a9d2ad020fb8a85992976e4c9ba592a20e26
parent 81d4c7fff4ae7d17ff59d6dbc6524ae8b91f651c
parent 21b7dfb707f748d1333d393ef22fb9bb8cd3e308

Merge "power: pm8921-charger: Bound lower AICL limit at 500 mA" into msm-3.0

drivers/power/pm8921-charger.c

diff --git a/drivers/power/pm8921-charger.c b/drivers/power/pm8921-charger.c
index eea4fa1..8e9d753 100644
--- a/drivers/power/pm8921-charger.c
+++ b/drivers/power/pm8921-charger.c
@@ -2211,7 +2211,7 @@
 	reg_loop = pm_chg_get_regulation_loop(chip);
 	pr_debug("reg_loop=0x%x usb_ma = %d\n", reg_loop, usb_ma);
 
-	if (reg_loop & VIN_ACTIVE_BIT) {
+	if ((reg_loop & VIN_ACTIVE_BIT) && (usb_ma > USB_WALL_THRESHOLD_MA)) {
 		decrease_usb_ma_value(&usb_ma);
 		usb_target_ma = usb_ma;
 		/* end AICL here */