From: Dmitry Osipenko Date: Thu, 19 Aug 2021 23:51:11 +0000 (+0300) Subject: power: supply: core: Fix parsing of battery chemistry/technology X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c9398455b046fc7a44b6dd53d9d6fe4b11c21700;p=linux.git power: supply: core: Fix parsing of battery chemistry/technology The power_supply_get_battery_info() fails if device-chemistry property is missing in a device-tree because error variable is propagated to the final return of the function, fix it. Fixes: 4eef766b7d4d ("power: supply: core: Parse battery chemistry/technology") Signed-off-by: Dmitry Osipenko Reviewed-by: Linus Walleij Signed-off-by: Sebastian Reichel --- diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c index dd62c871b2b50..0c2132c7f5d40 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -619,8 +619,7 @@ int power_supply_get_battery_info(struct power_supply *psy, * Documentation/power/power_supply_class.rst. */ - err = of_property_read_string(battery_np, "device-chemistry", &value); - if (!err) { + if (!of_property_read_string(battery_np, "device-chemistry", &value)) { if (!strcmp("nickel-cadmium", value)) info->technology = POWER_SUPPLY_TECHNOLOGY_NiCd; else if (!strcmp("nickel-metal-hydride", value))