diff mbox series

[5.10,016/120] Input: i8042 - unbreak Pegatron C15B

Message ID	20210208145819.040638869@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.10 016/120] Input: i8042 - unbreak Pegatron C15B Date: Mon, 8 Feb 2021 16:00:03 +0100 Message-Id: <20210208145819.040638869@linuxfoundation.org> In-Reply-To: <20210208145818.395353822@linuxfoundation.org> References: <20210208145818.395353822@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.10,003/120] USB: serial: option: Adding support for Cinterion MV31 [5.10,005/120] USB: gadget: legacy: fix an error code in eth_bind() [5.10,007/120] USB: usblp: dont call usb_set_interface if theres a single alt [5.10,009/120] usb: dwc2: Fix endpoint direction check in ep_from_windex [5.10,010/120] usb: dwc3: fix clock issue during resume in OTG mode [5.10,012/120] usb: xhci-mtk: skip dropping bandwidth of unchecked endpoints [5.10,014/120] ARM: OMAP1: OSK: fix ohci-omap breakage [5.10,015/120] arm64: dts: qcom: c630: keep both touchpad devices enabled [5.10,016/120] Input: i8042 - unbreak Pegatron C15B [5.10,017/120] arm64: dts: amlogic: meson-g12: Set FL-adj property value [5.10,018/120] arm64: dts: rockchip: fix vopl iommu irq on px30 [5.10,019/120] arm64: dts: rockchip: Use only supported PCIe link speed on Pinebook Pro [5.10,022/120] ARM: dts: stm32: Disable WP on DHCOM uSD slot [5.10,025/120] vdpa/mlx5: Fix memory key MTT population [5.10,026/120] bpf, cgroup: Fix optlen WARN_ON_ONCE toctou [5.10,029/120] um: virtio: free vu_dev only with the contained struct device [5.10,030/120] bpf, preload: Fix build when $(O) points to a relative path [5.10,031/120] arm64: dts: meson: switch TFLASH_VDD_EN pin to open drain on Odroid-C4 [5.10,032/120] r8169: work around RTL8125 UDP hw bug [5.10,034/120] arm64: dts: ls1046a: fix dcfg address range [5.10,036/120] igc: set the default return value to -IGC_ERR_NVM in igc_write_nvm_srwr [5.10,039/120] ibmvnic: device remove has higher precedence over reset [5.10,040/120] net/mlx5: Fix function calculation for page trees [5.10,041/120] net/mlx5: Fix leak upon failure of rule creation [5.10,042/120] net/mlx5e: Update max_opened_tc also when channels are closed [5.10,046/120] r8169: fix WoL on shutdown if CONFIG_DEBUG_SHIRQ is set [5.10,048/120] ARM: dts: sun7i: a20: bananapro: Fix ethernet phy-mode [5.10,050/120] vdpa/mlx5: Restore the hardware used index after change map [5.10,051/120] memblock: do not start bottom-up allocations with kernel_end [5.10,053/120] thunderbolt: Fix possible NULL pointer dereference in tb_acpi_add_link() [5.10,054/120] ovl: fix dentry leak in ovl_get_redirect [5.10,057/120] mac80211: fix station rate table updates on assoc [5.10,062/120] tracing: Use pause-on-trace with the latency tracers [5.10,063/120] tracepoint: Fix race between tracing and removing tracepoint [5.10,064/120] libnvdimm/namespace: Fix visibility of namespace resource attribute [5.10,065/120] libnvdimm/dimm: Avoid race between probe and available_slots_show() [5.10,067/120] genirq/msi: Activate Multi-MSI early when MSI_FLAG_ACTIVATE_EARLY is set [5.10,070/120] RISC-V: Define MAXPHYSMEM_1GB only for RV32 [5.10,073/120] smb3: Fix out-of-bounds bug in SMB2_negotiate() [5.10,075/120] mmc: sdhci-pltfm: Fix linking err for sdhci-brcmstb [5.10,077/120] Fix unsynchronized access to sev members through svm_register_enc_region [5.10,078/120] drm/dp/mst: Export drm_dp_get_vc_payload_bw() [5.10,079/120] drm/i915: Fix the MST PBN divider calculation [5.10,081/120] drm/i915/gt: Close race between enable_breadcrumbs and cancel_breadcrumbs [5.10,083/120] drm/i915: Extract intel_ddi_power_up_lanes() [5.10,084/120] drm/i915: Power up combo PHY lanes for for HDMI as well [5.10,089/120] KVM: x86/mmu: Fix TDP MMU zap collapsible SPTEs [5.10,090/120] KVM: x86: Allow guests to see MSR_IA32_TSX_CTRL even if tsx=off [5.10,093/120] KVM: x86: Set so called reserved CR3 bits in LM mask at vCPU reset [5.10,096/120] ARM: footbridge: fix dc21285 PCI configuration accessors [5.10,097/120] ARM: 9043/1: tegra: Fix misplaced tegra_uart_config in decompressor [5.10,098/120] mm: hugetlbfs: fix cannot migrate the fallocated HugeTLB page [5.10,099/120] mm: hugetlb: fix a race between freeing and dissolving the page [5.10,100/120] mm: hugetlb: fix a race between isolating and freeing page [5.10,102/120] mm, compaction: move high_pfn to the for loop scope [5.10,103/120] mm/vmalloc: separate put pages and flush VM flags [5.10,108/120] x86/debug: Prevent data breakpoints on __per_cpu_offset [5.10,109/120] x86/debug: Prevent data breakpoints on cpu_dr7 [5.10,110/120] x86/apic: Add extra serialization for non-serializing MSRs [5.10,111/120] Input: goodix - add support for Goodix GT9286 chip [5.10,113/120] Input: ili210x - implement pressure reporting for ILI251x [5.10,114/120] md: Set prev_flush_start and flush_bio in an atomic way [5.10,120/120] net: sched: replaced invalid qdisc tree flush helper in qdisc_replace

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 3a2dcf0805f12..c74b020796a94 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"),