2021-03-23 13:08:54

by Arnd Bergmann

Subject: [PATCH] Input: i8042 - fix Pegatron C15B ID entry

From: Arnd Bergmann <[email protected]>

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 <[email protected]>
---
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 */
--
2.29.2

2021-03-23 14:47:55

by Marcos Paulo de Souza

Subject: Re: [PATCH] Input: i8042 - fix Pegatron C15B ID entry

On Tue, 2021-03-23 at 14:06 +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> 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 <[email protected]>

>
> Fixes: b5d6e7ab7fe7 ("Input: i8042 - add ASUS Zenbook Flip to
> noselftest list")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> 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 */

2021-03-23 17:00:12

by Dmitry Torokhov

Subject: Re: [PATCH] Input: i8042 - fix Pegatron C15B ID entry

On Tue, Mar 23, 2021 at 02:06:13PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> 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 <[email protected]>

Applied, thank you.

--
Dmitry

2021-03-24 02:03:13

by Hans de Goede

Subject: Re: [PATCH] Input: i8042 - fix Pegatron C15B ID entry

Hi,

On 3/23/21 2:06 PM, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> 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 <[email protected]>

Thanks, patch looks good to me:

Reviewed-by: Hans de Goede <[email protected]>

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 */
>