summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorMichael Nosthoff <committed@heine.so>2019-08-16 09:37:42 +0200
committerSebastian Reichel <sre@kernel.org>2019-09-02 10:06:23 +0200
commit99956a9e08251a1234434b492875b1eaff502a12 (patch)
treeb041514d1ff03e43c2866bd74e980dae7a4d8486 /drivers/power
parentpower: supply: axp288_fuel_gauge: Add Minix Neo Z83-4 to the blacklist (diff)
downloadlinux-99956a9e08251a1234434b492875b1eaff502a12.tar.xz
linux-99956a9e08251a1234434b492875b1eaff502a12.zip
power: supply: sbs-battery: use correct flags field
the type flag is stored in the chip->flags field not in the client->flags field. This currently leads to never using the ti specific health function as client->flags doesn't use that bit. So it's always falling back to the general one. Fixes: 76b16f4cdfb8 ("power: supply: sbs-battery: don't assume MANUFACTURER_DATA formats") Cc: <stable@vger.kernel.org> Signed-off-by: Michael Nosthoff <committed@heine.so> Reviewed-by: Brian Norris <briannorris@chromium.org> Reviewed-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/supply/sbs-battery.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c
index 048d205d7074..2e86cc1e0e35 100644
--- a/drivers/power/supply/sbs-battery.c
+++ b/drivers/power/supply/sbs-battery.c
@@ -620,7 +620,7 @@ static int sbs_get_property(struct power_supply *psy,
switch (psp) {
case POWER_SUPPLY_PROP_PRESENT:
case POWER_SUPPLY_PROP_HEALTH:
- if (client->flags & SBS_FLAGS_TI_BQ20Z75)
+ if (chip->flags & SBS_FLAGS_TI_BQ20Z75)
ret = sbs_get_ti_battery_presence_and_health(client,
psp, val);
else