Commit 0c4ba621 authored Feb 02, 2022 by Guillaume Bertholon Committed by Greg Kroah-Hartman Feb 03, 2022

Input: i8042 - Fix misplaced backport of "add ASUS Zenbook Flip to noselftest list"



The upstream commit b5d6e7ab7fe7 ("Input: i8042 - add ASUS Zenbook Flip to
noselftest list") inserted a new entry in the `i8042_dmi_noselftest_table`
table, further patched by commit daa58c8eec0a ("Input: i8042 - fix Pegatron
C15B ID entry") to insert a missing separator.

However, their backported version in stable (commit e480ccf4
("Input: i8042 - add ASUS Zenbook Flip to noselftest list") and
commit 7444a415 ("Input: i8042 - fix Pegatron C15B ID entry"))
inserted this entry in `i8042_dmi_forcemux_table` instead.

This patch moves the entry back into `i8042_dmi_noselftest_table`.

Fixes: e480ccf4 ("Input: i8042 - add ASUS Zenbook Flip to noselftest list")
Signed-off-by: Guillaume Bertholon <guillaume.bertholon@ens.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 52060aa1

drivers/input/serio/i8042-x86ia64io.h

+6 −5

Original line number	Diff line number	Diff line
		@@ -586,11 +586,6 @@ static const struct dmi_system_id i8042_dmi_forcemux_table[] __initconst = {
		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-CS"),
		},
		}, {
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
		DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /* Convertible Notebook */
		},
		},
		{ }
		};
		@@ -677,6 +672,12 @@ static const struct dmi_system_id i8042_dmi_noselftest_table[] = {
		DMI_MATCH(DMI_PRODUCT_NAME, "Z450LA"),
		},
		},
		{
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
		DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /* Convertible Notebook */
		},
		},
		{ }
		};
		static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {