From patchwork Mon Apr 26 07:29:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 427521 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3462400jao; Mon, 26 Apr 2021 00:39:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXiZRwXjxHQpWKef9iCopxKWVWikkGXTHAIRPheN5qdUjwyEuCLpcDr1szUuOWJPGGGLwL X-Received: by 2002:a65:5a81:: with SMTP id c1mr15946872pgt.356.1619422787152; Mon, 26 Apr 2021 00:39:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619422787; cv=none; d=google.com; s=arc-20160816; b=r/VUy7G77hr9JhwttNEwx3HydSXpYlrlBBdkmCObTY3y+oEzps1dx+Dq7W8p7i7P6r k0z0FLu70sH9t8OtrkD9PxZckefUOxdOEKmaTEIVHZnsrrT7DTqtD9OT6LifVA+Be4Dg 6Gu9xq3hIfEFPSPvfs/Zwlw3llGwKk3CEIRj0olauDVy0HA16EXZf3Is6MU1Yz5lkN9D EHn67Eq7zjrlfeYVaWc3snrqv7K/QztRmRsGf7pAoHdAkG6RWsJSb219t4TFdZ/lhSdg srwNoa27cU41nilbZlurPgKSJvknvHPOF7VGqcdxBx1YdVVcsBOEB59Ckg7VG5x9TaWh Wajg== 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=NpEY7wDZJJoHaX/Bc6pWjjDtR27cgtTVHxs2IUiGfPv4BVllJy4681W/ObbYq5FoeL L+S3QDdsGURpjbUW/3hAInLxZIuJDhMibz0DlxGpp6SRdqBHvpT1HW5QNeEskJD0dNP0 rvSqvDPNYlSbkEefibbAcEHi22J+MjrQdxLjgVIkgGzAhU7IjjJKSn7oN40ZxMeFP+q4 vPnrF26M+rolYAWUeQgFwb4kc8wWtFCejg/oJ495lBo4QY0f1hsqNfQP1xlohAspHQvE rq+bjIZsavmGkyPpLn1Zj8DVZKBLqIXYMEdEXW+s6Vd+sp0D/kaZEbpu//IthgQpAkBG ozYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XfhHH+lA; 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 u27si17120814pgl.205.2021.04.26.00.39.46; Mon, 26 Apr 2021 00:39: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=XfhHH+lA; 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 S232158AbhDZHkZ (ORCPT + 12 others); Mon, 26 Apr 2021 03:40:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:47638 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233100AbhDZHif (ORCPT ); Mon, 26 Apr 2021 03:38:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 02DA661263; Mon, 26 Apr 2021 07:36:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619422588; bh=S9j2j3t4tF2/8xQSthAg9QuWfEmYK7JBs2DtGb+LQoc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XfhHH+lAICsRv5WaKqmOSk6Qe0pT6skULzIzo3pg0iNVZ7RpQo87w9V9D1fykxpJg k8lEnUd6+vkNLPRMzrVtT+MxzmkFtZjmT0OEisnPV1vcAI7CPLI7E5TkD7PJVpQbh1 UW0pAcXfor4dypEIAkadX3ackbbQVwysQTAsIPB0= 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.19 24/57] Input: i8042 - fix Pegatron C15B ID entry Date: Mon, 26 Apr 2021 09:29:21 +0200 Message-Id: <20210426072821.397565284@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210426072820.568997499@linuxfoundation.org> References: <20210426072820.568997499@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 */