power: supply: bq27xxx: report "not charging" on all types
[ Upstream commit7bf738ba11
] Commit6f24ff97e3
("power: supply: bq27xxx_battery: Add the BQ27Z561 Battery monitor") and commitd74534c277
("power: bq27xxx_battery: Add support for additional bq27xxx family devices") added support for new device types by copying most of the code and adding necessary quirks. However they did not copy the code in bq27xxx_battery_status() responsible for returning POWER_SUPPLY_STATUS_NOT_CHARGING. Unify the bq27xxx_battery_status() so for all types when charger is supplied, it will return "not charging" status. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
036b0f4d76
commit
a10ed3b55f
|
@ -1678,8 +1678,6 @@ static int bq27xxx_battery_status(struct bq27xxx_device_info *di,
|
|||
status = POWER_SUPPLY_STATUS_FULL;
|
||||
else if (di->cache.flags & BQ27000_FLAG_CHGS)
|
||||
status = POWER_SUPPLY_STATUS_CHARGING;
|
||||
else if (power_supply_am_i_supplied(di->bat) > 0)
|
||||
status = POWER_SUPPLY_STATUS_NOT_CHARGING;
|
||||
else
|
||||
status = POWER_SUPPLY_STATUS_DISCHARGING;
|
||||
} else {
|
||||
|
@ -1691,6 +1689,10 @@ static int bq27xxx_battery_status(struct bq27xxx_device_info *di,
|
|||
status = POWER_SUPPLY_STATUS_CHARGING;
|
||||
}
|
||||
|
||||
if ((status == POWER_SUPPLY_STATUS_DISCHARGING) &&
|
||||
(power_supply_am_i_supplied(di->bat) > 0))
|
||||
status = POWER_SUPPLY_STATUS_NOT_CHARGING;
|
||||
|
||||
val->intval = status;
|
||||
|
||||
return 0;
|
||||
|
|
Loading…
Reference in New Issue