Skip to contentSkip to conversation

Input: i8042 - fix Pegatron C15B ID entry

PATCH Applied Arnd Bergmann 4 participants 4 messages Mar 23, 2021

Subsystems (2)
HID Input drivers
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 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(+)
drivers/input/serio/i8042-x86ia64io.h +1 -0
index 9119e12a5778..a5a003553646 100644
@@ -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 */
Signature · 1 line
2.29.2
Reviewed-by on v1 1/1
#1 lore raw

Hi,

Quoted 12 lines · Arnd Bergmann

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')

Quoted 4 lines

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

Quoted 17 lines
---
 drivers/input/serio/i8042-x86ia64io.h | 1 +
 1 file changed, 1 insertion(+)
drivers/input/serio/i8042-x86ia64io.h +1 -0
index 9119e12a5778..a5a003553646 100644
@@ -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 */
Reviewed-by on v1 1/1
#2 lore raw
In reply to Arnd Bergmann
Quoted 7 lines · Arnd Bergmann

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:
Quoted 8 lines

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]>
Quoted 26 lines
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(+)
drivers/input/serio/i8042-x86ia64io.h +1 -0
index 9119e12a5778..a5a003553646 100644
@@ -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
 */
 		},
+	}, {
drivers/input/serio/i8042-x86ia64io.h +0 -0
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER

INC."),
DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /*
Convertible Notebook */

maintainer Applied
#3 lore raw
In reply to Arnd Bergmann
Quoted 12 lines · Arnd Bergmann

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')

Quoted 4 lines

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.

Signature · 1 line
Dmitry