commit 862f51bac900c4b8a6e31792369e588bb395b8a3
author Jenny Ho <hsiufangho@google.com> Wed Aug 04 22:15:52 2021 +0800
committer Jenny Ho <hsiufangho@google.com> Thu Aug 05 12:32:42 2021 +0800
tree b6391aba947566bec1b1a9344c04eae157c604d3
parent fb9b4412a237e0c890df2aee5309bdcef8406f55

google_charger: clear overheat status in bd_reset

Bug: 194447426
Signed-off-by: Jenny Ho <hsiufangho@google.com>
Change-Id: I7e6078c730d14e89a55dae0f3a978023768b4f97
(cherry picked from commit 1cc730b5950a98da6f948746bdab3211bdc1ccd1)

drivers/power/supply/google_charger.c

diff --git a/drivers/power/supply/google_charger.c b/drivers/power/supply/google_charger.c
index 85af847..9f47958 100644
--- a/drivers/power/supply/google_charger.c
+++ b/drivers/power/supply/google_charger.c
@@ -2133,8 +2133,21 @@
 	if (ret < 0)
 		return ret;
 
-	if (val)
-		bd_reset(&chg_drv->bd_state);
+	if (!val)
+		return ret;
+
+	mutex_lock(&chg_drv->bd_lock);
+
+	ret = bd_batt_set_state(chg_drv, false, -1);
+	if (ret < 0)
+		pr_err("MSC_BD set_batt_state (%d)\n", ret);
+
+	bd_reset(&chg_drv->bd_state);
+
+	if (chg_drv->chg_psy)
+		power_supply_changed(chg_drv->chg_psy);
+
+	mutex_unlock(&chg_drv->bd_lock);
 
 	if (chg_drv->bat_psy)
 		power_supply_changed(chg_drv->bat_psy);