diff options
author | Jiri Kosina <jkosina@suse.cz> | 2023-06-27 22:38:37 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2023-06-27 22:38:37 +0200 |
commit | 1639f986e37ada6407f21825dd079ca3c17141b7 (patch) | |
tree | 58dec5de2bed7a2ef64660f0eb97c9068f4aba06 /include | |
parent | e80b500370e71b8cd7dd64be4080cee0a3e5068f (diff) | |
parent | 49904a0ebf23b15aad288a10f5354e7cd8193121 (diff) |
Merge branch 'for-6.5/core' into for-linus
- more bullet-proof handling of devres-managed resources in HID core
(Dmitry Torokhov)
- kunit test Kconfig dependency fix (Geert Uytterhoeven)
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/hid.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 4e4c4fe36911..39e21e3815ad 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -597,6 +597,7 @@ struct hid_device { /* device report descriptor */ struct semaphore driver_input_lock; /* protects the current driver */ struct device dev; /* device */ struct hid_driver *driver; + void *devres_group_id; /* ID of probe devres group */ const struct hid_ll_driver *ll_driver; struct mutex ll_open_lock; |