From patchwork Mon Apr 19 13:05:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 423984 Delivered-To: patch@linaro.org Received: by 2002:a02:6a6f:0:0:0:0:0 with SMTP id m47csp2704964jaf; Mon, 19 Apr 2021 06:10:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCLzRKYWjUUSbBWiRUY8AdVVEgUqMInHaxKFsUdDv0C5jkeVYZRwdQEmcFy8MkGPoKeyEe X-Received: by 2002:a05:6a00:1a4a:b029:261:d9ed:fd80 with SMTP id h10-20020a056a001a4ab0290261d9edfd80mr2068944pfv.20.1618837847094; Mon, 19 Apr 2021 06:10:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618837847; cv=none; d=google.com; s=arc-20160816; b=mF9yniHhZiomE9WdXwzHEiSq2coBACqVy393qNHjufQFjVAEu+CUDcZlGCOaXJaJrq 729X7Jvd/aovtu0pNc7LFzvkJJBA/BJ8OcZe0jsA1rRd8fovCh2LbB3PyVpEiMdNwoAH 7LxmZQhjhnXBCtbDDT7rb5Cnshtk2pZQcTFR0qC6+d8m7n90B4ksdFKwBRV0TnxM05md aok9BMpAc2ZaspAEUashYkkUQ9Cm0a0naGVVsAiUliQAxqUZg8GdpDgLEk/Z9Yj7vcHO vPGeYZkHNhF+zo0T+e0qaipzpcj/1xzIhYtpHt4xXFnhtz8mbsRdSOCs4G8uiCWsIKfU Ho9g== 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=ikN2jvISx+YPx417x4+Sb1ByHQSm4UC41dZYRr8UoOk=; b=L+AS5rzOJN7m682usehR0cqhCU1BfLvu6VFtz50tvkL1APozr74mtjaCb6n0IHGIwS eH9XI2E9pwqh5XBwRUQZWX74bSkTNEyOOfGo84vOsgz9E52WKGL0BQOYW0izf/0FF6V/ w+TZcsxSoMUCr2D9CVf5nFEL3piZyjZsTCo66ogdmWrzCvLMv0TC2LFQk909UGsd7EI/ 20ME7cdD7ogmNIDe2VX6Azck6b3SH9ElmUW24W8F96YjZBOIfn6XvH3NnMTMcNbyBJ2n L9WvgAzNBZ+TKgkkHFLMy3d3vH4W5DPOX0Fd5qVLcQl0s/G2OULB3pxYJw95yQ2rxpO4 U7ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OGKH6KDW; 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 x2si18039730pjq.103.2021.04.19.06.10.46; Mon, 19 Apr 2021 06:10:47 -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=OGKH6KDW; 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 S239563AbhDSNLL (ORCPT + 12 others); Mon, 19 Apr 2021 09:11:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:45438 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239753AbhDSNKb (ORCPT ); Mon, 19 Apr 2021 09:10:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E0FA361285; Mon, 19 Apr 2021 13:09:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618837800; bh=0DKbLwpRtrE8G4XtVlLlfF7mDlBZ8+CTdiglRTavET0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OGKH6KDWtnivt2u3GTjqpaA2Bip+1bmDdxAq/f/ov8pwt/KVfI9y/1i3tcNnJUytv qFYsPuDMWUxPFn9nBZG5mnZKBsG2/AnuZbK618Ek76XdVdVX+zFwsjd5oQoadnUCNG S8LpmTdXSwhht8DNzzUHuTcYBtMwUueJOiohE648= 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 5.11 057/122] Input: i8042 - fix Pegatron C15B ID entry Date: Mon, 19 Apr 2021 15:05:37 +0200 Message-Id: <20210419130532.123205886@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419130530.166331793@linuxfoundation.org> References: <20210419130530.166331793@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 @@ -588,6 +588,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 */