summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuanjun Gong <ruc_gongyuanjun@163.com>2025-05-13 20:37:32 +0800
committerSebastian Reichel <sebastian.reichel@collabora.com>2025-06-22 19:28:53 +0200
commita9aece5d7e8fa8bc74f1827d2cf1b189ffe7e8c8 (patch)
treec27a621cf69f695e702a0a1a45119319b8e99f6f
parent22e4d29f081df8a10f1c062d3d952bb876eb9bdc (diff)
power: return the correct error code
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>
-rw-r--r--drivers/power/supply/max1720x_battery.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/power/supply/max1720x_battery.c b/drivers/power/supply/max1720x_battery.c
index ea3912fd1de8..12ecb1f40fe1 100644
--- a/drivers/power/supply/max1720x_battery.c
+++ b/drivers/power/supply/max1720x_battery.c
@@ -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;