| Message ID | 20201228072335.GA27766@localhost.localdomain (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a3a9060ecad030e2c7903b2b258383d2c716b56c |
| Headers | show |
| Series | input, i8042: unbreak Pegatron C15B | expand |
LGTM, thanks for spotting this!
Acked-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
On Mon, Dec 28, 2020 at 10:23:35AM +0300, Alexey Dobriyan wrote: > 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> Applied, thank you.
--- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -219,6 +219,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"),
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> --- drivers/input/serio/i8042-x86ia64io.h | 2 ++ 1 file changed, 2 insertions(+)