lkml.org 
[lkml]   [2021]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 016/120] Input: i8042 - unbreak Pegatron C15B
    Date
    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 3a2dcf0805f12..c74b020796a94 100644
    --- 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"),
    --
    2.27.0


    \
     
     \ /
      Last update: 2021-02-08 18:03    [W:4.062 / U:0.876 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site