diff options
| author |   Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2018-07-13 16:13:50 +0200 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2018-07-17 15:33:47 +0200 |
| commit | 08a8a7cf14595f95d5cbb28ef5c15c56a6255fb4 (patch) | |
| tree | 7b51d919ff29ee607b2229bd69f6a9059975c131 /include/linux/hid.h | |
| parent | HID: input: enable Totem on the Dell Canvas 27 (diff) | |
| download | linux-dev-08a8a7cf14595f95d5cbb28ef5c15c56a6255fb4.tar.xz linux-dev-08a8a7cf14595f95d5cbb28ef5c15c56a6255fb4.zip | |
HID: core: do not upper bound the collection stack
Looks like 4 was sufficient until now. However, the Surface Dial needs
a stack of 5 and simply fails at probing.
Dynamically add HID_COLLECTION_STACK_SIZE to the size of the stack if
we hit the upper bound.
Checkpatch complains about bare unsigned, so converting those to
'unsigned int' in struct hid_parser
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'include/linux/hid.h')
| -rw-r--r-- | include/linux/hid.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 2e4498d52a2f..aee281522c6d 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -644,12 +644,13 @@ static inline void hid_set_drvdata(struct hid_device *hdev, void *data) struct hid_parser { struct hid_global global; struct hid_global global_stack[HID_GLOBAL_STACK_SIZE]; - unsigned global_stack_ptr; + unsigned int global_stack_ptr; struct hid_local local; - unsigned collection_stack[HID_COLLECTION_STACK_SIZE]; - unsigned collection_stack_ptr; + unsigned int *collection_stack; + unsigned int collection_stack_ptr; + unsigned int collection_stack_size; struct hid_device *device; - unsigned scan_flags; + unsigned int scan_flags; }; struct hid_class_descriptor { |