Commit c9398455 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Sebastian Reichel
Browse files

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: 4eef766b ("power: supply: core: Parse battery chemistry/technology")
Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent eaa2c490

drivers/power/supply/power_supply_core.c

+1 −2
Original line number Diff line number Diff line
@@ -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))