Message ID | 20210323130623.2302402-1-arnd@kernel.org (mailing list archive) |
---|---|
State | Accepted |
Commit | daa58c8eec0a65ac8e2e77ff3ea8a233d8eec954 |
Headers | show |
Series | Input: i8042 - fix Pegatron C15B ID entry | expand |
Hi, On 3/23/21 2:06 PM, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > The Zenbook Flip entry that was added overwrites a previous one > because of a typo: > > In file included from drivers/input/serio/i8042.h:23, > from drivers/input/serio/i8042.c:131: > drivers/input/serio/i8042-x86ia64io.h:591:28: error: initialized field overwritten [-Werror=override-init] > 591 | .matches = { > | ^ > drivers/input/serio/i8042-x86ia64io.h:591:28: note: (near initialization for 'i8042_dmi_noselftest_table[0].matches') > > Add the missing separator between the two. > > Fixes: b5d6e7ab7fe7 ("Input: i8042 - add ASUS Zenbook Flip to noselftest list") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Thanks, patch looks good to me: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > --- > drivers/input/serio/i8042-x86ia64io.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h > index 9119e12a5778..a5a003553646 100644 > --- a/drivers/input/serio/i8042-x86ia64io.h > +++ b/drivers/input/serio/i8042-x86ia64io.h > @@ -588,6 +588,7 @@ static const struct dmi_system_id i8042_dmi_noselftest_table[] = { > DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), > DMI_MATCH(DMI_CHASSIS_TYPE, "10"), /* Notebook */ > }, > + }, { > .matches = { > DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), > DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /* Convertible Notebook */ >
On Tue, 2021-03-23 at 14:06 +0100, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > The Zenbook Flip entry that was added overwrites a previous one > because of a typo: > > In file included from drivers/input/serio/i8042.h:23, > from drivers/input/serio/i8042.c:131: > drivers/input/serio/i8042-x86ia64io.h:591:28: error: initialized > field overwritten [-Werror=override-init] > 591 | .matches = { > | ^ > drivers/input/serio/i8042-x86ia64io.h:591:28: note: (near > initialization for 'i8042_dmi_noselftest_table[0].matches') > > Add the missing separator between the two. Oops, my bad... Thanks for fixing it Arnd. Reviewed-by: Marcos Paulo de Souza <mpdesouza@suse.com> > > Fixes: b5d6e7ab7fe7 ("Input: i8042 - add ASUS Zenbook Flip to > noselftest list") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/input/serio/i8042-x86ia64io.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/input/serio/i8042-x86ia64io.h > b/drivers/input/serio/i8042-x86ia64io.h > index 9119e12a5778..a5a003553646 100644 > --- a/drivers/input/serio/i8042-x86ia64io.h > +++ b/drivers/input/serio/i8042-x86ia64io.h > @@ -588,6 +588,7 @@ static const struct dmi_system_id > i8042_dmi_noselftest_table[] = { > DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER > INC."), > DMI_MATCH(DMI_CHASSIS_TYPE, "10"), /* Notebook > */ > }, > + }, { > .matches = { > DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER > INC."), > DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /* > Convertible Notebook */
On Tue, Mar 23, 2021 at 02:06:13PM +0100, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > The Zenbook Flip entry that was added overwrites a previous one > because of a typo: > > In file included from drivers/input/serio/i8042.h:23, > from drivers/input/serio/i8042.c:131: > drivers/input/serio/i8042-x86ia64io.h:591:28: error: initialized field overwritten [-Werror=override-init] > 591 | .matches = { > | ^ > drivers/input/serio/i8042-x86ia64io.h:591:28: note: (near initialization for 'i8042_dmi_noselftest_table[0].matches') > > Add the missing separator between the two. > > Fixes: b5d6e7ab7fe7 ("Input: i8042 - add ASUS Zenbook Flip to noselftest list") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Applied, thank you.
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index 9119e12a5778..a5a003553646 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -588,6 +588,7 @@ static const struct dmi_system_id i8042_dmi_noselftest_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_CHASSIS_TYPE, "10"), /* Notebook */ }, + }, { .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /* Convertible Notebook */