diff options
| author | Ikjoon Jang <ikjn@chromium.org> | 2020-09-03 11:04:40 +0800 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2020-10-06 11:46:53 +0200 |
| commit | 8ae237ec0af9f754c1da00913646f3c46a99a1cb (patch) | |
| tree | a8e4ce2beaa7a0f1246c32af1b26fa539d7a3bfe /drivers/power | |
| parent | 5069185fc18e810715a91d80fcd075e03add600c (diff) | |
power: supply: sbs-battery: keep error code when get_property() fails
Commit 395a7251dc2b (power: supply: sbs-battery: don't assume
i2c errors as battery disconnect) overwrites the original error code
returned from internal functions. On such a sporadic i2c error,
a user will get a wrong value without errors.
Fixes: 395a7251dc2b (power: supply: sbs-battery: don't assume i2c errors as battery disconnect)
Signed-off-by: Ikjoon Jang <ikjn@chromium.org>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/sbs-battery.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c index dacc4bc1c013..13192cbcce71 100644 --- a/drivers/power/supply/sbs-battery.c +++ b/drivers/power/supply/sbs-battery.c @@ -962,11 +962,10 @@ static int sbs_get_property(struct power_supply *psy, if (!chip->gpio_detect && chip->is_present != (ret >= 0)) { bool old_present = chip->is_present; union power_supply_propval val; - - ret = sbs_get_battery_presence_and_health( + int err = sbs_get_battery_presence_and_health( client, POWER_SUPPLY_PROP_PRESENT, &val); - sbs_update_presence(chip, !ret && val.intval); + sbs_update_presence(chip, !err && val.intval); if (old_present != chip->is_present) power_supply_changed(chip->power_supply); @@ -976,19 +975,14 @@ done: if (!ret) { /* Convert units to match requirements for power supply class */ sbs_unit_adjustment(client, psp, val); + dev_dbg(&client->dev, + "%s: property = %d, value = %x\n", __func__, + psp, val->intval); + } else if (!chip->is_present) { + /* battery not present, so return NODATA for properties */ + ret = -ENODATA; } - - dev_dbg(&client->dev, - "%s: property = %d, value = %x\n", __func__, psp, val->intval); - - if (ret && chip->is_present) - return ret; - - /* battery not present, so return NODATA for properties */ - if (ret) - return -ENODATA; - - return 0; + return ret; } static void sbs_supply_changed(struct sbs_info *chip) |