From 363ef6df520851c88eb5cee4b300f8ad4e83aed4 Mon Sep 17 00:00:00 2001 From: YiHsiang Peng Date: Mon, 23 Dec 2019 11:48:53 +0800 Subject: [PATCH] ANDROID: GKI: google_battery: return string type for serial_number property Bug: 146759409 Change-Id: Idbd61d9007e645b78eba1690ad6e58825f79787d Signed-off-by: YiHsiang Peng (cherry picked from commit 686c676a7fc07b45d364408eb1c125523e2a7e5f) Signed-off-by: Mark Salyzyn Bug: 150789066 --- drivers/power/supply/power_supply_sysfs.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c index af91ccd0dd1a..77b1a8dc9e11 100644 --- a/drivers/power/supply/power_supply_sysfs.c +++ b/drivers/power/supply/power_supply_sysfs.c @@ -221,15 +221,9 @@ static ssize_t power_supply_show_property(struct device *dev, case POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT: ret = sprintf(buf, "%lld\n", value.int64val); break; - case POWER_SUPPLY_PROP_MODEL_NAME ... POWER_SUPPLY_PROP_CYCLE_COUNTS: + case POWER_SUPPLY_PROP_MODEL_NAME ... POWER_SUPPLY_PROP_SERIAL_NUMBER: ret = sprintf(buf, "%s\n", value.strval); break; - /* - * FIXME: b/139264914, ignore it temporarily to avoid hit NULL point. - * will review it - */ - case POWER_SUPPLY_PROP_SERIAL_NUMBER: - break; default: ret = sprintf(buf, "%d\n", value.intval); }