From: Greg Kroah-Hartman Date: Wed, 2 Feb 2022 17:53:40 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v4.4.302~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b45645a0904e5e10ba50666c9908bb847e135e1;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: input-i8042-fix-misplaced-backport-of-add-asus-zenbook-flip-to-noselftest-list.patch --- diff --git a/queue-4.4/input-i8042-fix-misplaced-backport-of-add-asus-zenbook-flip-to-noselftest-list.patch b/queue-4.4/input-i8042-fix-misplaced-backport-of-add-asus-zenbook-flip-to-noselftest-list.patch new file mode 100644 index 00000000000..e2b5360e01d --- /dev/null +++ b/queue-4.4/input-i8042-fix-misplaced-backport-of-add-asus-zenbook-flip-to-noselftest-list.patch @@ -0,0 +1,56 @@ +From guillaume.bertholon@ens.fr Wed Feb 2 18:52:57 2022 +From: Guillaume Bertholon +Date: Wed, 2 Feb 2022 15:03:23 +0100 +Subject: Input: i8042 - Fix misplaced backport of "add ASUS Zenbook Flip to noselftest list" +To: gregkh@linuxfoundation.org +Cc: guillaume.bertholon@ens.fr, stable@vger.kernel.org +Message-ID: <1643810603-6968-1-git-send-email-guillaume.bertholon@ens.fr> + +From: 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 +Signed-off-by: Greg Kroah-Hartman +--- + drivers/input/serio/i8042-x86ia64io.h | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +--- 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_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_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[] = { diff --git a/queue-4.4/series b/queue-4.4/series index 33cd51cbf25..584e8b3daa1 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -23,3 +23,4 @@ bluetooth-mgmt-fix-misplaced-bt_hs-check.patch revert-drm-radeon-ci-disable-mclk-switching-for-high-refresh-rates-v2.patch revert-tc358743-fix-register-i2c_rd-wr-function-fix.patch kvm-x86-fix-misplaced-backport-of-work-around-leak-of-uninitialized-stack-contents.patch +input-i8042-fix-misplaced-backport-of-add-asus-zenbook-flip-to-noselftest-list.patch