From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
Hans de Goede <hdegoede@redhat.com>,
Marcos Paulo de Souza <mpdesouza@suse.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>
Subject: [PATCH 4.4 17/32] Input: i8042 - fix Pegatron C15B ID entry
Date: Mon, 26 Apr 2021 09:29:15 +0200 [thread overview]
Message-ID: <20210426072817.174624360@linuxfoundation.org> (raw)
In-Reply-To: <20210426072816.574319312@linuxfoundation.org>
From: Arnd Bergmann <arnd@arndb.de>
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 <arnd@arndb.de>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Marcos Paulo de Souza <mpdesouza@suse.com>
Link: https://lore.kernel.org/r/20210323130623.2302402-1-arnd@kernel.org
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
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 */
next prev parent reply other threads:[~2021-04-26 7:31 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-26 7:28 [PATCH 4.4 00/32] 4.4.268-rc1 review Greg Kroah-Hartman
2021-04-26 7:28 ` [PATCH 4.4 01/32] net/sctp: fix race condition in sctp_destroy_sock Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 02/32] Input: nspire-keypad - enable interrupts only when opened Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 03/32] dmaengine: dw: Make it dependent to HAS_IOMEM Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 04/32] ARM: dts: Fix moving mmc devices with aliases for omap4 & 5 Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 05/32] arc: kernel: Return -EFAULT if copy_to_user() fails Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 06/32] neighbour: Disregard DEAD dst in neigh_update Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 07/32] ARM: keystone: fix integer overflow warning Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 08/32] ASoC: fsl_esai: Fix TDM slot setup for I2S mode Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 09/32] net: ieee802154: stop dump llsec keys for monitors Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 10/32] net: ieee802154: stop dump llsec devs " Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 11/32] net: ieee802154: forbid monitor for add llsec dev Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 12/32] net: ieee802154: stop dump llsec devkeys for monitors Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 13/32] net: ieee802154: forbid monitor for add llsec devkey Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 14/32] net: ieee802154: stop dump llsec seclevels for monitors Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 15/32] net: ieee802154: forbid monitor for add llsec seclevel Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 16/32] pcnet32: Use pci_resource_len to validate PCI resource Greg Kroah-Hartman
2021-04-26 7:29 ` Greg Kroah-Hartman [this message]
2021-04-26 7:29 ` [PATCH 4.4 18/32] scsi: libsas: Reset num_scatter if libata marks qc as NODATA Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 19/32] net: davicom: Fix regulator not turned off on failed probe Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 20/32] i40e: fix the panic when running bpf in xdpdrv mode Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 21/32] ARM: 9071/1: uprobes: Dont hook on thumb instructions Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 22/32] net: hso: fix null-ptr-deref during tty device unregistration Greg Kroah-Hartman
2021-04-26 7:36 ` Johan Hovold
2021-04-26 7:58 ` Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 23/32] ext4: correct error label in ext4_rename() Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 24/32] ARM: dts: Fix swapped mmc order for omap3 Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 25/32] s390/entry: save the caller of psw_idle Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 26/32] xen-netback: Check for hotplug-status existence before watching Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 27/32] cavium/liquidio: Fix duplicate argument Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 28/32] ia64: fix discontig.c section mismatches Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 29/32] ia64: tools: remove duplicate definition of ia64_mf() on ia64 Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 30/32] compiler.h: enable builtin overflow checkers and add fallback code Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 31/32] overflow.h: Add allocation size calculation helpers Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.4 32/32] x86/crash: Fix crash_setup_memmap_entries() out-of-bounds access Greg Kroah-Hartman
2021-04-26 9:05 ` [PATCH 4.4 00/32] 4.4.268-rc1 review Pavel Machek
2021-04-26 13:04 ` Jon Hunter
2021-04-26 18:32 ` Guenter Roeck
2021-04-26 23:48 ` Shuah Khan
2021-04-27 7:48 ` Naresh Kamboju
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210426072817.174624360@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=arnd@arndb.de \
--cc=dmitry.torokhov@gmail.com \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mpdesouza@suse.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.