Skip to content

Commit a9aece5

Browse files
AnnYugawasre
authored andcommitted
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sebastian Reichel <[email protected]>
1 parent 22e4d29 commit a9aece5

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/power/supply/max1720x_battery.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,8 @@ static int max1720x_battery_get_property(struct power_supply *psy,
426426
break;
427427
case POWER_SUPPLY_PROP_MODEL_NAME:
428428
ret = regmap_read(info->regmap, MAX172XX_DEV_NAME, &reg_val);
429+
if (ret)
430+
return ret;
429431
reg_val = FIELD_GET(MAX172XX_DEV_NAME_TYPE_MASK, reg_val);
430432
if (reg_val == MAX172XX_DEV_NAME_TYPE_MAX17201)
431433
val->strval = max17201_model;

0 commit comments

Comments
 (0)