power: supply: Reset err after not finding static battery

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2071846
Tested: This is one of a series of patch sets to enable Arm SystemReady IR
 support in the kernel for NXP i.MX8 platforms.  This set updates the
 power subsystem.  This set has been tested via simple boot tests and
 the CI loop.

commit 581045e
Author: Yassine Oudjana <y.oudjana@protonmail.com>
Date:   Tue Mar 29 03:34:03 2022 +0000

    power: supply: Reset err after not finding static battery

    Otherwise power_supply_get_battery_info always returns -ENODEV
    on devices that do not have a static battery, even when a simple
    battery is found.

    Fixes: c8aee3f ("power: supply: Static data for Samsung batteries")
    Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
    Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
    (cherry picked from commit 581045e)

Signed-off-by: Al Stone <ahs3@redhat.com>

Author: Al Stone

drivers/power/supply/power_supply_core.c

@@ -604,6 +604,12 @@ int power_supply_get_battery_info(struct power_supply *psy,
 	err = samsung_sdi_battery_get_info(&psy->dev, value, &info);
 	if (!err)
 		goto out_ret_pointer;
+	else if (err == -ENODEV)
+		/*
+		 * Device does not have a static battery.
+		 * Proceed to look for a simple battery.
+		 */
+		err = 0;
 
 	if (strcmp("simple-battery", value)) {
 		err = -ENODEV;