diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-09-25 16:35:52 -0700 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2020-09-26 02:54:22 +0200 |
| commit | 505f394fa239cecb76d916aa858f87ed7ea7fde4 (patch) | |
| tree | 7871e15236907b5212f19d5c50445c3afe28f523 | |
| parent | d9216d753b2b1406b801243b12aaf00a5ce5b861 (diff) | |
| download | linux-stable-505f394fa239cecb76d916aa858f87ed7ea7fde4.tar.gz linux-stable-505f394fa239cecb76d916aa858f87ed7ea7fde4.tar.bz2 linux-stable-505f394fa239cecb76d916aa858f87ed7ea7fde4.zip | |
HID: hid-input: fix stylus battery reporting
With commit 4f3882177240 hid-input started clearing of "ignored" usages
to avoid using garbage that might have been left in them. However
"battery strength" usages should not be ignored, as we do want to
use them.
Fixes: 4f3882177240 ("HID: hid-input: clear unmapped usages")
Reported-by: Kenneth Albanowski <kenalba@google.com>
Tested-by: Kenneth Albanowski <kenalba@google.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | drivers/hid/hid-input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 88e19996427e..9770db624bfa 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -797,7 +797,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel case 0x3b: /* Battery Strength */ hidinput_setup_battery(device, HID_INPUT_REPORT, field); usage->type = EV_PWR; - goto ignore; + return; case 0x3c: /* Invert */ map_key_clear(BTN_TOOL_RUBBER); @@ -1059,7 +1059,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel case HID_DC_BATTERYSTRENGTH: hidinput_setup_battery(device, HID_INPUT_REPORT, field); usage->type = EV_PWR; - goto ignore; + return; } goto unknown; |