]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
power: return the correct error code
authorYuanjun Gong <ruc_gongyuanjun@163.com>
Tue, 13 May 2025 12:37:32 +0000 (20:37 +0800)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Sun, 22 Jun 2025 17:28:53 +0000 (19:28 +0200)
In POWER_SUPPLY_PROP_MODEL_NAME branch of max1720x_battery_get_property(),
program would return -ENODEV out of FIELD_GET error, but it's better also
considering the error code returned by regmap_read() in case it fails.

Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com>
Link: https://lore.kernel.org/r/20250513123732.3041577-1-ruc_gongyuanjun@163.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/supply/max1720x_battery.c

index ea3912fd1de8bfd0d029c16f276316d06e1b105c..12ecb1f40fe12dc2b63472b739d8ab5f1266bbc8 100644 (file)
@@ -426,6 +426,8 @@ static int max1720x_battery_get_property(struct power_supply *psy,
                break;
        case POWER_SUPPLY_PROP_MODEL_NAME:
                ret = regmap_read(info->regmap, MAX172XX_DEV_NAME, &reg_val);
+               if (ret)
+                       return ret;
                reg_val = FIELD_GET(MAX172XX_DEV_NAME_TYPE_MASK, reg_val);
                if (reg_val == MAX172XX_DEV_NAME_TYPE_MAX17201)
                        val->strval = max17201_model;