diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-10 12:00:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-10 12:00:39 -0400 |
| commit | f755407dd19072b7d20719bc5454caed9ab41cc1 (patch) | |
| tree | afb1cd4f40314adb70eda77b493a09cc7c16e0d8 /include | |
| parent | 05a88a43604abb816dfbff075bb114224641793b (diff) | |
| parent | 1deb9d341d475ff84262e927d6c0e36fecb9942e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
- fix usage of sleeping lock in atomic context from Jiri Kosina
- build fix for hid-steelseries under certain .config setups by Simon Wood
- simple mismerge fix from Fernando Luis Vázquez Cao
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: debug: fix RCU preemption issue
HID: hid-steelseries fix led class build issue
HID: reintroduce fix-up for certain Sony RF receivers
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index af1b86d46f6e..0c48991b0402 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h | |||
| @@ -515,7 +515,7 @@ struct hid_device { /* device report descriptor */ | |||
| 515 | struct dentry *debug_rdesc; | 515 | struct dentry *debug_rdesc; |
| 516 | struct dentry *debug_events; | 516 | struct dentry *debug_events; |
| 517 | struct list_head debug_list; | 517 | struct list_head debug_list; |
| 518 | struct mutex debug_list_lock; | 518 | spinlock_t debug_list_lock; |
| 519 | wait_queue_head_t debug_wait; | 519 | wait_queue_head_t debug_wait; |
| 520 | }; | 520 | }; |
| 521 | 521 | ||