diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2020-12-16 13:38:38 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2020-12-16 13:38:38 +0300 |
| commit | 105856b36c0cefc2fa1c1e649d75da71e2e38c31 (patch) | |
| tree | 87adba76a320aa4ef4e122db84af21a9eac93382 /drivers/hid/hid-input.c | |
| parent | 90c5f4649aafd0bca6f47f67ea0ba596c93a3ab0 (diff) | |
| parent | f43d3870cafa2a0f3854c1819c8385733db8f9ae (diff) | |
| download | linux-105856b36c0cefc2fa1c1e649d75da71e2e38c31.tar.xz | |
Merge branch 'for-5.11/core' into for-linus
- increase of maximum HID report size to 16KB in order to support
some of the modern devices, from Dean Camera
- control interface support for hidraw, from Dean Camera
- stylus battery reporting improvement, from Dmitry Torokhov
Diffstat (limited to 'drivers/hid/hid-input.c')
| -rw-r--r-- | drivers/hid/hid-input.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 4dca11392459..dc7f6b4a775c 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -537,9 +537,12 @@ static void hidinput_update_battery(struct hid_device *dev, int value) capacity = hidinput_scale_battery_capacity(dev, value); if (dev->battery_status != HID_BATTERY_REPORTED || - capacity != dev->battery_capacity) { + capacity != dev->battery_capacity || + ktime_after(ktime_get_coarse(), dev->battery_ratelimit_time)) { dev->battery_capacity = capacity; dev->battery_status = HID_BATTERY_REPORTED; + dev->battery_ratelimit_time = + ktime_add_ms(ktime_get_coarse(), 30 * 1000); power_supply_changed(dev->battery); } } @@ -746,6 +749,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel field->flags |= HID_MAIN_ITEM_RELATIVE; break; } + goto unknown; default: goto unknown; } |