| commit | 4ad74f9cac34fb04537ba1a23e63bb412206cba6 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Sat Sep 22 05:37:13 2012 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Sat Sep 22 05:37:06 2012 -0700 |
| tree | bcd0ee47f8622554b71e90f9baf34c365b3aacb2 | |
| parent | 3a3e729189b5f1f38c2bccedf31dccb06b7840ca [diff] | |
| parent | d8878596b9b19668fd1f1b226a333d955f2218c4 [diff] |
Merge "power: pm8921-charger: Control CHG_USB_SUSPEND enabling boost"
diff --git a/drivers/power/pm8921-charger.c b/drivers/power/pm8921-charger.c index 7a5b75e..f4f336f 100644 --- a/drivers/power/pm8921-charger.c +++ b/drivers/power/pm8921-charger.c
@@ -1852,6 +1852,9 @@ } if (disable) pr_warn("current drawn from chg=0, battery provides current\n"); + + pm_chg_usb_suspend_enable(the_chip, disable); + return pm_chg_charge_dis(the_chip, disable); } EXPORT_SYMBOL(pm8921_disable_source_current);