Skip to content

Commit a60ccb6

Browse files
dtorgregkh
authored andcommitted
HID: input: do not report stylus battery state as "full"
[ Upstream commit f4abaa9 ] The power supply states of discharging, charging, full, etc, represent state of charging, not the capacity level of the battery (for which we have a separate property). Current HID usage tables to not allow for expressing charging state of the batteries found in generic styli, so we should simply assume that the battery is discharging even if current capacity is at 100% when battery strength reporting is done via HID interface. In fact, we were doing just that before commit 581c448. This change helps UIs to not mis-represent fully charged batteries in styli as being charging/topping-off. Fixes: 581c448 ("HID: input: map digitizer battery usage") Reported-by: Kenneth Albanowski <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]> Signed-off-by: Jiri Kosina <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 8c2d150 commit a60ccb6

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

drivers/hid/hid-input.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,6 @@ static int hidinput_get_battery_property(struct power_supply *psy,
419419

420420
if (dev->battery_status == HID_BATTERY_UNKNOWN)
421421
val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
422-
else if (dev->battery_capacity == 100)
423-
val->intval = POWER_SUPPLY_STATUS_FULL;
424422
else
425423
val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
426424
break;

0 commit comments

Comments
 (0)