commit cc17da1287ad9c76245eaf1b2b2ccc0b00b6080f
author Jenny Ho <hsiufangho@google.com> Tue Jul 12 01:41:43 2022 +0000
committer Jenny Ho <hsiufangho@google.com> Tue Jul 12 09:17:16 2022 +0000
tree 6ccf7b77d0da965fa58ee167efce0d14527209b0
parent 897284b040d243ad38227ad0038b6d018a960f1a

google_battery: check fg_psy before reading data

Bug: 238581005
Signed-off-by: Jenny Ho <hsiufangho@google.com>
Change-Id: I14481a97e0c81b9156a0088a3f778a352b5c07b7

google_battery.c

diff --git a/google_battery.c b/google_battery.c
index 72dbfd2..cce6ef4 100644
--- a/google_battery.c
+++ b/google_battery.c
@@ -4749,9 +4749,11 @@
 {
 	struct power_supply *psy = container_of(dev, struct power_supply, dev);
 	struct batt_drv *batt_drv = power_supply_get_drvdata(psy);
-	int value;
+	int value = -1;
 
-	value = GPSY_GET_PROP(batt_drv->fg_psy, GBMS_PROP_RESISTANCE);
+	if (batt_drv->fg_psy)
+		value = GPSY_GET_PROP(batt_drv->fg_psy, GBMS_PROP_RESISTANCE);
+
 	return scnprintf(buff, PAGE_SIZE, "%d\n", value);
 }
 
@@ -4777,9 +4779,11 @@
 {
 	struct power_supply *psy = container_of(dev, struct power_supply, dev);
 	struct batt_drv *batt_drv = power_supply_get_drvdata(psy);
-	int value;
+	int value = -1;
 
-	value = GPSY_GET_PROP(batt_drv->fg_psy, GBMS_PROP_CHARGE_FULL_ESTIMATE);
+	if (batt_drv->fg_psy)
+		value = GPSY_GET_PROP(batt_drv->fg_psy, GBMS_PROP_CHARGE_FULL_ESTIMATE);
+
 	return scnprintf(buff, PAGE_SIZE, "%d\n", value);
 }