Commit e923e82d authored Jan 03, 2021 by Alexey Dobriyan Committed by Greg Kroah-Hartman Feb 10, 2021

Input: i8042 - unbreak Pegatron C15B



[ Upstream commit a3a9060ecad030e2c7903b2b258383d2c716b56c ]

g++ reports

	drivers/input/serio/i8042-x86ia64io.h:225:3: error: ‘.matches’ designator used multiple times in the same initializer list

C99 semantics is that last duplicated initialiser wins,
so DMI entry gets overwritten.

Fixes: a48491c65b51 ("Input: i8042 - add ByteSpeed touchpad to noloop table")
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
Link: https://lore.kernel.org/r/20201228072335.GA27766@localhost.localdomain


Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 2a6e9df1

drivers/input/serio/i8042-x86ia64io.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -223,6 +223,8 @@ static const struct dmi_system_id __initconst i8042_dmi_noloop_table[] = {
	DMI_MATCH(DMI_SYS_VENDOR, "PEGATRON CORPORATION"),		DMI_MATCH(DMI_SYS_VENDOR, "PEGATRON CORPORATION"),
	DMI_MATCH(DMI_PRODUCT_NAME, "C15B"),		DMI_MATCH(DMI_PRODUCT_NAME, "C15B"),
	},		},
			},
			{
	.matches = {		.matches = {
	DMI_MATCH(DMI_SYS_VENDOR, "ByteSpeed LLC"),		DMI_MATCH(DMI_SYS_VENDOR, "ByteSpeed LLC"),
	DMI_MATCH(DMI_PRODUCT_NAME, "ByteSpeed Laptop C15B"),		DMI_MATCH(DMI_PRODUCT_NAME, "ByteSpeed Laptop C15B"),