diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-21 17:23:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-21 17:23:11 -0700 |
| commit | 6efdb114b430000b6b96d5beb78cd1345d4513dd (patch) | |
| tree | 519fe3c5709897c0d55b6130ba686baeeef99a59 /include | |
| parent | e51a3630565f61a5151f24f9ece191277ddaa320 (diff) | |
| parent | 26ba61f871b4aa9958bcebffcbeb558094d75928 (diff) | |
| download | linux-stable-6efdb114b430000b6b96d5beb78cd1345d4513dd.tar.gz linux-stable-6efdb114b430000b6b96d5beb78cd1345d4513dd.tar.bz2 linux-stable-6efdb114b430000b6b96d5beb78cd1345d4513dd.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
"Bugfixes for HID subsystem that should go in 4.1. Important
highlights:
- the patch that extended support for HID++ protocol for TK820
touchpad turns out to be causing regressions due to firmware
issues; patch reverting back to basic support from Benjamin
Tissoires
- Wacom driver can oops for devices that report non-touch data on
touch interfaces. Fix from Ping Cheng
- gpiolib is not mandatory for i2c-hid, so the driver shouldn't fail
if gpiolib is not enabled. Fix from Mika Westerberg"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: wacom: fix an Oops caused by wacom_wac_finger_count_touches
HID: usbhid: Add HID_QUIRK_NOGET for Aten DVI KVM switch
HID: hid-sensor-hub: Fix debug lock warning
Revert "HID: logitech-hidpp: support combo keyboard touchpad TK820"
HID: i2c-hid: Do not fail probing if gpiolib is not enabled
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hid-sensor-hub.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/hid-sensor-hub.h b/include/linux/hid-sensor-hub.h index 0408421d885f..0042bf330b99 100644 --- a/include/linux/hid-sensor-hub.h +++ b/include/linux/hid-sensor-hub.h @@ -74,7 +74,7 @@ struct sensor_hub_pending { * @usage: Usage id for this hub device instance. * @start_collection_index: Starting index for a phy type collection * @end_collection_index: Last index for a phy type collection - * @mutex: synchronizing mutex. + * @mutex_ptr: synchronizing mutex pointer. * @pending: Holds information of pending sync read request. */ struct hid_sensor_hub_device { @@ -84,7 +84,7 @@ struct hid_sensor_hub_device { u32 usage; int start_collection_index; int end_collection_index; - struct mutex mutex; + struct mutex *mutex_ptr; struct sensor_hub_pending pending; }; |