| From 1ae4e625fd5254b4a8e0dd7a214e6441f2d797e6 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 3 Jan 2021 17:59:51 -0800 |
| Subject: Input: i8042 - unbreak Pegatron C15B |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Alexey Dobriyan <adobriyan@gmail.com> |
| |
| [ 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> |
| --- |
| drivers/input/serio/i8042-x86ia64io.h | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h |
| index b256e3006a6fb..844875df8cad7 100644 |
| --- a/drivers/input/serio/i8042-x86ia64io.h |
| +++ b/drivers/input/serio/i8042-x86ia64io.h |
| @@ -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_PRODUCT_NAME, "C15B"), |
| }, |
| + }, |
| + { |
| .matches = { |
| DMI_MATCH(DMI_SYS_VENDOR, "ByteSpeed LLC"), |
| DMI_MATCH(DMI_PRODUCT_NAME, "ByteSpeed Laptop C15B"), |
| -- |
| 2.27.0 |
| |
