From patchwork Mon Apr 26 07:29:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 427519 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3460600jao; Mon, 26 Apr 2021 00:36:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgrD50s21O7Lo8VBIWhiQSksJHUUTWe/E7/tNb/L4qWBK74ow0RFXYnGfm4Mn8IwnNZiVZ X-Received: by 2002:a17:902:f254:b029:eb:6a57:9d11 with SMTP id j20-20020a170902f254b02900eb6a579d11mr17171743plc.81.1619422597246; Mon, 26 Apr 2021 00:36:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619422597; cv=none; d=google.com; s=arc-20160816; b=qz/TiDozfBIcM7H4HApdK70S/FxH/lz1A3nio7vskBXFgSQFCgs27sMfSW7kOqCbr1 GZuLvop9esIFtTfof561yD+abXmoyp3jMrTNtR7nvE2GIZ5ziNq3lbfnDsJe4zXBC4zv PBbAi7w7fMakuEkVqZRq/LXDb2uGvTQjAOL83AhPd0rW9X3DOOrbTY3b9i3H5682AmV3 VtVip3nfEaht6+FXkHV+lLUXMkN4MqhumBxnp1DOnXdAkMBhO6JuXipoDf15OJbJtmjv DDHEpcoIsiQ+OWgKrsYClKMPTBEmQGuS9ZznIIUZZK3M+PSEzxO84PXLFTj9w1PqkPeP JqDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RvgHOmFmpxhDE+hYwGD0S7teVlen7eTylkm4h6ZrrLg=; b=VfeQHJ8+b5OiebdvhIa/RHAj1VN37tuwpRCsqNE1igRXPPX+ZsZdPdoXArhmaUrc/R 2MWoEvGjZT2bIBH78r/jRBjbCMdI3UOAOaFMRMuzr3gttblQadGEuBB53jMTnCJj52dP q5SwhAk+Q41B2oi/rwloHRXWzKpgOfETMZzaWz7p4clYaDcUZbcrv88QykgVcqgFLfXg JigkrZmGMivauCfiBFY3DecCIZcIwsACdqBX1pobWiMZLkF9YTe6c7m2fYPVdQKmt1tL 030YdBnr5hRfjr/dbn37ZkAhuoV+KPqIfpKBM9/etSVJR2/87u9kETn6W5YgB6Qx1t8c c/Pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ioEmqgvx; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j11si3080818plk.0.2021.04.26.00.36.37; Mon, 26 Apr 2021 00:36:37 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ioEmqgvx; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232599AbhDZHhQ (ORCPT + 12 others); Mon, 26 Apr 2021 03:37:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:46576 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232869AbhDZHgi (ORCPT ); Mon, 26 Apr 2021 03:36:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 569C561004; Mon, 26 Apr 2021 07:34:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619422458; bh=S9j2j3t4tF2/8xQSthAg9QuWfEmYK7JBs2DtGb+LQoc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ioEmqgvxfprInbTtMpX/7OUIUXtgNL94O/P7FbS9+RS8FjP8IXx+juOWGjp6h3v6u pfEV/ZgjQHSpmVa1EZok1A1pme9SHchfhdipzrBffCab8NMmYP2B/HYc1MXkSSwD3E v9rVpk5fXugPE2NwM743EMEO9Aw04xPBqYLuNrMM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Hans de Goede , Marcos Paulo de Souza , Dmitry Torokhov Subject: [PATCH 4.14 20/49] Input: i8042 - fix Pegatron C15B ID entry Date: Mon, 26 Apr 2021 09:29:16 +0200 Message-Id: <20210426072820.417323643@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210426072819.721586742@linuxfoundation.org> References: <20210426072819.721586742@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 @@ -592,6 +592,7 @@ static const struct dmi_system_id i8042_ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_CHASSIS_TYPE, "10"), /* Notebook */ }, + }, { .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /* Convertible Notebook */