commit e595e897f670a1e566b3a3e8ea6bd2b74ba360af
author Linux Build Service Account <lnxbuild@localhost> Fri Jan 10 07:43:01 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jan 10 07:43:01 2014 -0800
tree 5f5494b63b2243c868150106b1d14fa2851c45b1
parent 46892cdf202c76aebbeb10666762a7e732d5866b
parent d53183a5d541a00e5ee045844ff5f80fe3198a69

Merge "power: qpnp-charger: enable arb workaround for DC_IN"

drivers/power/qpnp-charger.c

diff --git a/drivers/power/qpnp-charger.c b/drivers/power/qpnp-charger.c
index ee74b1b..e009a8d 100644
--- a/drivers/power/qpnp-charger.c
+++ b/drivers/power/qpnp-charger.c
@@ -1197,7 +1197,9 @@
 		pr_err("failed to read usb_chgpth_sts rc=%d\n", rc);
 
 	pr_debug("chg_gone triggered\n");
-	if (qpnp_chg_is_usb_chg_plugged_in(chip) && (usb_sts & CHG_GONE_IRQ)) {
+	if ((qpnp_chg_is_usb_chg_plugged_in(chip)
+			|| qpnp_chg_is_dc_chg_plugged_in(chip))
+			&& (usb_sts & CHG_GONE_IRQ)) {
 		qpnp_chg_charge_en(chip, 0);
 		qpnp_chg_force_run_on_batt(chip, 1);
 		schedule_delayed_work(&chip->arb_stop_work,