diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2020-12-16 11:38:38 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2020-12-16 11:38:38 +0100 |
| commit | 105856b36c0cefc2fa1c1e649d75da71e2e38c31 (patch) | |
| tree | 87adba76a320aa4ef4e122db84af21a9eac93382 /include/linux | |
| parent | 90c5f4649aafd0bca6f47f67ea0ba596c93a3ab0 (diff) | |
| parent | f43d3870cafa2a0f3854c1819c8385733db8f9ae (diff) | |
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 'include/linux')
| -rw-r--r-- | include/linux/hid.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 58684657960b..c39d71eb1fd0 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -494,7 +494,7 @@ struct hid_report_enum { }; #define HID_MIN_BUFFER_SIZE 64 /* make sure there is at least a packet size of space */ -#define HID_MAX_BUFFER_SIZE 8192 /* 8kb */ +#define HID_MAX_BUFFER_SIZE 16384 /* 16kb */ #define HID_CONTROL_FIFO_SIZE 256 /* to init devices with >100 reports */ #define HID_OUTPUT_FIFO_SIZE 64 @@ -585,6 +585,7 @@ struct hid_device { /* device report descriptor */ __s32 battery_report_id; enum hid_battery_status battery_status; bool battery_avoid_query; + ktime_t battery_ratelimit_time; #endif unsigned long status; /* see STAT flags above */ |