diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2022-01-10 16:50:07 +0100 |
|---|---|---|
| committer | Sebastian Reichel <sebastian.reichel@collabora.com> | 2022-02-11 21:19:51 +0100 |
| commit | f444578d727a0ca4a72b19cd4a1d7da9f1fb99fe (patch) | |
| tree | 2feeb4d8be45d811752a3ad6b230adcb36aa8f2b /drivers | |
| parent | power: supply: core: fix application of sizeof to pointer (diff) | |
| download | linux-f444578d727a0ca4a72b19cd4a1d7da9f1fb99fe.tar.xz linux-f444578d727a0ca4a72b19cd4a1d7da9f1fb99fe.zip | |
power: supply: bq256xx: Handle OOM correctly
Since we now return a pointer to an allocated object we need
to account for memory allocation failure in a separate
error path.
Fixes: 25fd330370ac ("power: supply_core: Pass pointer to battery info")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/supply/bq256xx_charger.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/power/supply/bq256xx_charger.c b/drivers/power/supply/bq256xx_charger.c index b274942dc46a..01ad84fd147c 100644 --- a/drivers/power/supply/bq256xx_charger.c +++ b/drivers/power/supply/bq256xx_charger.c @@ -1523,6 +1523,9 @@ static int bq256xx_hw_init(struct bq256xx_device *bq) BQ256XX_WDT_BIT_SHIFT); ret = power_supply_get_battery_info(bq->charger, &bat_info); + if (ret == -ENOMEM) + return ret; + if (ret) { dev_warn(bq->dev, "battery info missing, default values will be applied\n"); |