diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-23 07:16:05 +1300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-23 07:16:05 +1300 |
| commit | 787a3b4322763284a594a5dd3680508c0bfb20b0 (patch) | |
| tree | bb02ff6637a2bb8a3c7c128cbd24f40bfd847ebc /include | |
| parent | 48b161983ae5266ffa42f0ccaf7224eaeda38e59 (diff) | |
| parent | 1950f462916edc9581168ca8d5882a8101e8bbcf (diff) | |
| download | linux-787a3b4322763284a594a5dd3680508c0bfb20b0.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid
Pull HID fixes from Jiri Kosina:
- descriptor parsing regression fix for devices that have more than 16
collections, from Peter Hutterer (and followup cleanup from Philipp
Zabel)
- quirk for Goodix touchpad
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
HID: core: simplify active collection tracking
HID: i2c-hid: Disable runtime PM on Goodix touchpad
HID: core: replace the collection tree pointers with indices
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hid.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index d99287327ef2..f9707d1dcb58 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -430,7 +430,7 @@ struct hid_local { */ struct hid_collection { - struct hid_collection *parent; + int parent_idx; /* device->collection */ unsigned type; unsigned usage; unsigned level; @@ -658,7 +658,6 @@ struct hid_parser { unsigned int *collection_stack; unsigned int collection_stack_ptr; unsigned int collection_stack_size; - struct hid_collection *active_collection; struct hid_device *device; unsigned int scan_flags; }; |