From patchwork Mon Apr 19 13:06:32 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: 423993 Delivered-To: patch@linaro.org Received: by 2002:a02:6a6f:0:0:0:0:0 with SMTP id m47csp2717883jaf; Mon, 19 Apr 2021 06:25:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDe5NyH68cZqhSHUyQBgEo7dXDuahy9SKXpXB4dNCrbdkk++jMQSGvcu3ik/cqTFPPcU/Y X-Received: by 2002:a05:6402:27ce:: with SMTP id c14mr25406156ede.263.1618838718586; Mon, 19 Apr 2021 06:25:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618838718; cv=none; d=google.com; s=arc-20160816; b=Bx2oqC/MgQx1ld7rlcNVHk/sIGm4KxnTHxY2VJFeYYdRUv5mgz6o3vbvmJ+vOXfZ6V p6yfaTnRFcTpspXXZ8lurcwz8nMBgtDlwHlc+QvSMPdjQaZi8aLcXlNNX4MdJg+vMbIj vMYjocw3xIeehL1VMuJqIRwtcjAq+8Yo7VLBXASx8bZUDPjfLaGMFvLPIAlqATK8DLvW 5Yv1Io+pqkIBzwjdXe+VDjHBP5+Txm1AOAxoize/N0NMFh6C/B1hwAv9d3ewJVJAHJYt 1tCRMtvMwV89Sg9j60Uaki97SdO3TNgtMVDHZZEAGSvjcJcZv8vDJPyJCAuSL/eKq7Aa VKnw== 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=ZTmPt+Z/yAYn0a3YqcwuRlalH3p+hW/BO/MtKfWMpYM7jd4elxEbU0iodoVhcelxOf kWaY+QFmjbHoWmGrAfM7PtZegZ8xF3v1JFGpKeLadzWcc9r4ghBvlDzcteFYIcaGQ9cC LJ1x2u3oPbIf3J8ySgRp/SMqt/tSbCqwogCKMfeH9pUijqPla+v28yo/pqMokCOa7hg8 p36yJbm5fT93QYW/5KokJmb2UVK3IrAYPicUfZW/9UaDwPlNeK9nduaJopweX1kL+TNs JKQX+DaWVBmFw39cI7SHY3Du6WrkkSJUvBuPNmqtUzuCNv7oY65aXPua60XZRxVnsX1r xhLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="JQ/KcgWr"; 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 l5si12356022ejz.74.2021.04.19.06.25.18; Mon, 19 Apr 2021 06:25:18 -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="JQ/KcgWr"; 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 S240631AbhDSNZp (ORCPT + 12 others); Mon, 19 Apr 2021 09:25:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:34378 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241937AbhDSNYz (ORCPT ); Mon, 19 Apr 2021 09:24:55 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BDDDD613DC; Mon, 19 Apr 2021 13:19:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618838383; bh=0DKbLwpRtrE8G4XtVlLlfF7mDlBZ8+CTdiglRTavET0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JQ/KcgWrZXzc22OTMsFkadcYuKi2JY9mFpzpi9IJzXJpz8+QJaiovCNjOULdQDIny wKVaYmc+wUcg92k4WMbH7SzIaIxWh+c+MhDdDl4iXyJb6avAVNOw1F2cO4i730DaSv 3WR3uV/uiVxy6SAFyKRWimQ8334ZHxvzxH617uEU= 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.4 41/73] Input: i8042 - fix Pegatron C15B ID entry Date: Mon, 19 Apr 2021 15:06:32 +0200 Message-Id: <20210419130525.159014041@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419130523.802169214@linuxfoundation.org> References: <20210419130523.802169214@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 */