diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-16 10:58:20 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-16 10:58:20 -0500 |
| commit | 1a1e8c6fada5f6dc48aa5dad453c9d9ebfdc8218 (patch) | |
| tree | 02f6a65ca2ce0ec0edc3c92e79194ccc9cca3e50 /drivers | |
| parent | ec0148736f54667641e3e24fa06d47db01d4ba7e (diff) | |
| parent | 6b90466cfec2a2fe027187d675d8d14217c12d82 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fix from Jiri Kosina:
"This has a build fix for architectures where memcmp() is macro, from
Jiri Slaby"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: microsoft: do not use compound literal - fix build
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hid/hid-microsoft.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c index f676c01bb471..6fcd466d0825 100644 --- a/drivers/hid/hid-microsoft.c +++ b/drivers/hid/hid-microsoft.c | |||
| @@ -46,9 +46,9 @@ static __u8 *ms_report_fixup(struct hid_device *hdev, __u8 *rdesc, | |||
| 46 | rdesc[559] = 0x45; | 46 | rdesc[559] = 0x45; |
| 47 | } | 47 | } |
| 48 | /* the same as above (s/usage/physical/) */ | 48 | /* the same as above (s/usage/physical/) */ |
| 49 | if ((quirks & MS_RDESC_3K) && *rsize == 106 && | 49 | if ((quirks & MS_RDESC_3K) && *rsize == 106 && rdesc[94] == 0x19 && |
| 50 | !memcmp((char []){ 0x19, 0x00, 0x29, 0xff }, | 50 | rdesc[95] == 0x00 && rdesc[96] == 0x29 && |
| 51 | &rdesc[94], 4)) { | 51 | rdesc[97] == 0xff) { |
| 52 | rdesc[94] = 0x35; | 52 | rdesc[94] = 0x35; |
| 53 | rdesc[96] = 0x45; | 53 | rdesc[96] = 0x45; |
| 54 | } | 54 | } |