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

Commit 6b90466c authored by Jiri Slaby's avatar Jiri Slaby Committed by Jiri Kosina
Browse files

HID: microsoft: do not use compound literal - fix build 



In patch "HID: microsoft: fix invalid rdesc for 3k kbd" I fixed
support for MS 3k keyboards. However the added check using memcmp and
a compound statement breaks build on architectures where memcmp is a
macro with parameters.

hid-microsoft.c:51:18: error: macro "memcmp" passed 6 arguments, but takes just 3

On x86_64, memcmp is a function, so I did not see the error.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent df0cfd69

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;

	}