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

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

[Guillaume Bertholon]

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 e480ccf433be
("Input: i8042 - add ASUS Zenbook Flip to noselftest list") and
commit 7444a4152ac3 ("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: e480ccf433be ("Input: i8042 - add ASUS Zenbook Flip to noselftest list")
Signed-off-by: Guillaume Bertholon <guillaume.bertholon@ens.fr>
---
 drivers/input/serio/i8042-x86ia64io.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 323b86b..a380676 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -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[] = {
--
2.7.4

Re: [PATCH 4.4] Input: i8042 - Fix misplaced backport of "add ASUS Zenbook Flip to noselftest list"

[Greg KH]

On Wed, Feb 02, 2022 at 03:03:23PM +0100, Guillaume Bertholon wrote:
> 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 e480ccf433be
> ("Input: i8042 - add ASUS Zenbook Flip to noselftest list") and
> commit 7444a4152ac3 ("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: e480ccf433be ("Input: i8042 - add ASUS Zenbook Flip to noselftest list")
> Signed-off-by: Guillaume Bertholon <guillaume.bertholon@ens.fr>
> ---
>  drivers/input/serio/i8042-x86ia64io.h | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 

Now queued up, thanks.

greg k-h