diff mbox series

[5.4,05/65] Input: i8042 - unbreak Pegatron C15B

Message ID	20210208145810.445834724@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Alexey Dobriyan <adobriyan@gmail.com>, Po-Hsu Lin <po-hsu.lin@canonical.com>, Dmitry Torokhov <dmitry.torokhov@gmail.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.4 05/65] Input: i8042 - unbreak Pegatron C15B Date: Mon, 8 Feb 2021 16:00:37 +0100 Message-Id: <20210208145810.445834724@linuxfoundation.org> In-Reply-To: <20210208145810.230485165@linuxfoundation.org> References: <20210208145810.230485165@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.4,03/65] USB: serial: option: Adding support for Cinterion MV31 [5.4,04/65] arm64: dts: qcom: c630: keep both touchpad devices enabled [5.4,05/65] Input: i8042 - unbreak Pegatron C15B [5.4,10/65] um: virtio: free vu_dev only with the contained struct device [5.4,12/65] arm64: dts: ls1046a: fix dcfg address range [5.4,13/65] igc: set the default return value to -IGC_ERR_NVM in igc_write_nvm_srwr [5.4,14/65] igc: check return value of ret_val in igc_config_fc_after_link_up [5.4,17/65] net: lapb: Copy the skb before sending a packet [5.4,19/65] r8169: fix WoL on shutdown if CONFIG_DEBUG_SHIRQ is set [5.4,24/65] USB: usblp: dont call usb_set_interface if theres a single alt [5.4,27/65] usb: dwc3: fix clock issue during resume in OTG mode [5.4,31/65] usb: host: xhci-plat: add priv quirk for skip PHY initialization [5.4,32/65] ovl: fix dentry leak in ovl_get_redirect [5.4,34/65] fgraph: Initialize tracing_graph_pause at task creation [5.4,35/65] kretprobe: Avoid re-registration of the same kretprobe earlier [5.4,36/65] libnvdimm/dimm: Avoid race between probe and available_slots_show() [5.4,37/65] genirq/msi: Activate Multi-MSI early when MSI_FLAG_ACTIVATE_EARLY is set [5.4,38/65] xhci: fix bounce buffer usage for non-sg list case [5.4,39/65] cifs: report error instead of invalid when revalidating a dentry fails [5.4,40/65] smb3: Fix out-of-bounds bug in SMB2_negotiate() [5.4,43/65] drm/amd/display: Revert "Fix EDID parsing after resume from suspend" [5.4,44/65] nvme-pci: avoid the deepest sleep state on Kingston A2000 SSDs [5.4,45/65] KVM: SVM: Treat SVM as unsupported when running as an SEV guest [5.4,48/65] mm: hugetlbfs: fix cannot migrate the fallocated HugeTLB page [5.4,49/65] mm: hugetlb: fix a race between freeing and dissolving the page [5.4,51/65] mm: hugetlb: remove VM_BUG_ON_PAGE from page_huge_active [5.4,55/65] x86/apic: Add extra serialization for non-serializing MSRs [5.4,57/65] Input: xpad - sync supported devices with fork on GitHub [5.4,58/65] iommu/vt-d: Do not use flush-queue when caching-mode is on [5.4,59/65] md: Set prev_flush_start and flush_bio in an atomic way [5.4,61/65] neighbour: Prevent a dead entry from updating gc_list [5.4,63/65] net: dsa: mv88e6xxx: override existent unicast portvec in port_fdb_add

Commit Message

Greg KH Feb. 8, 2021, 3 p.m. UTC

From: Alexey Dobriyan <adobriyan@gmail.com>

[ Upstream commit a3a9060ecad030e2c7903b2b258383d2c716b56c ]

g++ reports

	drivers/input/serio/i8042-x86ia64io.h:225:3: error: ‘.matches’ designator used multiple times in the same initializer list

C99 semantics is that last duplicated initialiser wins,
so DMI entry gets overwritten.

Fixes: a48491c65b51 ("Input: i8042 - add ByteSpeed touchpad to noloop table")
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
Link: https://lore.kernel.org/r/20201228072335.GA27766@localhost.localdomain
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/input/serio/i8042-x86ia64io.h | 2 ++
 1 file changed, 2 insertions(+)

diff mbox series

Patch

diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index eca931da76c3a..b7dbcbac3a1a5 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -219,6 +219,8 @@  static const struct dmi_system_id __initconst i8042_dmi_noloop_table[] = {
 			DMI_MATCH(DMI_SYS_VENDOR, "PEGATRON CORPORATION"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "C15B"),
 		},
+	},
+	{
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "ByteSpeed LLC"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "ByteSpeed Laptop C15B"),