diff options
| author | Paul Kocialkowski <contact@paulk.fr> | 2016-08-28 19:34:46 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2016-08-29 02:39:06 +0200 |
| commit | ae0f74be6e3db97b23f33be2219044576525176a (patch) | |
| tree | 8fb85232216a9baa4e10ef53afa3d81aab079319 /drivers/power/supply | |
| parent | power: supply: Change Krzysztof Kozlowski's email to kernel.org (diff) | |
| download | linux-ae0f74be6e3db97b23f33be2219044576525176a.tar.xz linux-ae0f74be6e3db97b23f33be2219044576525176a.zip | |
power: bq24735-charger: Assume not charging when charger is missing
When the charger is missing (disconnected), it is safe to assume that
the charger chip is no charging.
This is especially relevant when a status GPIO is present and the
charger is getting disconnected. bq24735_charger_is_charging will be
triggered due to the interrupt then, it will attempt to read whether it
is charging through i2c, which will fail as the charger is disconnected.
This also fixes that specific issue.
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power/supply')
| -rw-r--r-- | drivers/power/supply/bq24735-charger.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/power/supply/bq24735-charger.c b/drivers/power/supply/bq24735-charger.c index fa454c19ce17..dc460bb03d84 100644 --- a/drivers/power/supply/bq24735-charger.c +++ b/drivers/power/supply/bq24735-charger.c @@ -201,8 +201,12 @@ static bool bq24735_charger_is_present(struct bq24735 *charger) static int bq24735_charger_is_charging(struct bq24735 *charger) { - int ret = bq24735_read_word(charger->client, BQ24735_CHG_OPT); + int ret; + + if (!bq24735_charger_is_present(charger)) + return 0; + ret = bq24735_read_word(charger->client, BQ24735_CHG_OPT); if (ret < 0) return ret; |