From: Greg Kroah-Hartman Date: Sun, 18 Apr 2021 10:44:17 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v5.4.114~37 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=488241550b3ab218c094a3309650b0d674dadaf1;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: input-i8042-fix-pegatron-c15b-id-entry.patch --- diff --git a/queue-4.4/input-i8042-fix-pegatron-c15b-id-entry.patch b/queue-4.4/input-i8042-fix-pegatron-c15b-id-entry.patch new file mode 100644 index 00000000000..f92b75ca23e --- /dev/null +++ b/queue-4.4/input-i8042-fix-pegatron-c15b-id-entry.patch @@ -0,0 +1,43 @@ +From daa58c8eec0a65ac8e2e77ff3ea8a233d8eec954 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Tue, 23 Mar 2021 09:56:34 -0700 +Subject: Input: i8042 - fix Pegatron C15B ID entry + +From: Arnd Bergmann + +commit daa58c8eec0a65ac8e2e77ff3ea8a233d8eec954 upstream. + +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 +Reviewed-by: Hans de Goede +Reviewed-by: Marcos Paulo de Souza +Link: https://lore.kernel.org/r/20210323130623.2302402-1-arnd@kernel.org +Cc: stable@vger.kernel.org +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman +--- + drivers/input/serio/i8042-x86ia64io.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/input/serio/i8042-x86ia64io.h ++++ b/drivers/input/serio/i8042-x86ia64io.h +@@ -579,6 +579,7 @@ 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 */ diff --git a/queue-4.4/series b/queue-4.4/series index 47fc2e16436..324ad780c76 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -16,3 +16,4 @@ net-ieee802154-forbid-monitor-for-add-llsec-seclevel.patch pcnet32-use-pci_resource_len-to-validate-pci-resourc.patch net-rds-avoid-potential-use-after-free-in-rds_send_r.patch net-tipc-fix-spelling-errors-in-net-tipc-module.patch +input-i8042-fix-pegatron-c15b-id-entry.patch