Skip to content

Commit 208c60d

Browse files
goldelicogregkh
authored andcommitted
power: supply: bq27xxx: fix error return in case of no bq27000 hdq battery
commit 2c334d0 upstream. Since commit commit f16d9fb ("power: supply: bq27xxx: Retrieve again when busy") the console log of some devices with hdq enabled but no bq27000 battery (like e.g. the Pandaboard) is flooded with messages like: [ 34.247833] power_supply bq27000-battery: driver failed to report 'status' property: -1 as soon as user-space is finding a /sys entry and trying to read the "status" property. It turns out that the offending commit changes the logic to now return the value of cache.flags if it is <0. This is likely under the assumption that it is an error number. In normal errors from bq27xxx_read() this is indeed the case. But there is special code to detect if no bq27000 is installed or accessible through hdq/1wire and wants to report this. In that case, the cache.flags are set historically by commit 3dd843e ("bq27000: report missing device better.") to constant -1 which did make reading properties return -ENODEV. So everything appeared to be fine before the return value was passed upwards. Now the -1 is returned as -EPERM instead of -ENODEV, triggering the error condition in power_supply_format_property() which then floods the console log. So we change the detection of missing bq27000 battery to simply set cache.flags = -ENODEV instead of -1. Fixes: f16d9fb ("power: supply: bq27xxx: Retrieve again when busy") Cc: Jerry Lv <Jerry.Lv@axis.com> Cc: stable@vger.kernel.org Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com> Link: https://lore.kernel.org/r/692f79eb6fd541adb397038ea6e750d4de2deddf.1755945297.git.hns@goldelico.com Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 4c9b507 commit 208c60d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/power/supply/bq27xxx_battery.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1873,7 +1873,7 @@ static void bq27xxx_battery_update_unlocked(struct bq27xxx_device_info *di)
18731873

18741874
cache.flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, has_singe_flag);
18751875
if ((cache.flags & 0xff) == 0xff)
1876-
cache.flags = -1; /* read error */
1876+
cache.flags = -ENODEV; /* read error */
18771877
if (cache.flags >= 0) {
18781878
cache.temperature = bq27xxx_battery_read_temperature(di);
18791879
if (di->regs[BQ27XXX_REG_TTE] != INVALID_REG_ADDR)

0 commit comments

Comments
 (0)