Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a1e8c6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ec014873 6b90466c

drivers/hid/hid-microsoft.c

+3 −3
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ static __u8 *ms_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
		rdesc[559] = 0x45;

	}

	/* the same as above (s/usage/physical/) */

	if ((quirks & MS_RDESC_3K) && *rsize == 106 &&

			!memcmp((char []){ 0x19, 0x00, 0x29, 0xff },

				&rdesc[94], 4)) {

	if ((quirks & MS_RDESC_3K) && *rsize == 106 && rdesc[94] == 0x19 &&

			rdesc[95] == 0x00 && rdesc[96] == 0x29 &&

			rdesc[97] == 0xff) {

		rdesc[94] = 0x35;

		rdesc[96] = 0x45;

	}