From patchwork Mon Apr 19 13:05:59 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: 423991 Delivered-To: patch@linaro.org Received: by 2002:a02:6a6f:0:0:0:0:0 with SMTP id m47csp2714530jaf; Mon, 19 Apr 2021 06:21:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxV7SfuicmmHvThp7HvJJdWFxcEKT/JlxHxE494c2zm8lMsFZMmKAYTRKrMPts2uEbuAljY X-Received: by 2002:a05:6402:31ac:: with SMTP id dj12mr7370672edb.267.1618838467192; Mon, 19 Apr 2021 06:21:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618838467; cv=none; d=google.com; s=arc-20160816; b=wwdUlVnKB2c26SWTPxNY60A8FDOOlEs5cd45j2VpoaHKRNGWcf3CHcX+9skPIYCGZ1 p7dbE/+6H6P8BX0Bm+EF8ZHYH6f88dCP5k1BmGdymZuHvvzxXSx+tTG9FVPbMkSxzGgv qXWsRLtljxq7Yd37kQ1vrVE2JD7jwDNNlJ/SH2wuKt7Gwj8Z5vo8C51coHxlU80HtUdP X6p6e3JfDGWvcQ2Kb9iXvaBfeN3H7Eda5arrzPVVU55Q7Eoir2vo7kn+gG4JX4by3HVA ZpX8YHmUhQsYz/lKb1EFF5CrkSXcu1VDlXrDKy14otw7ghiLpFl9wpFVJwU47GY25zsp vTOQ== 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=nVtVDpCDT1GkIkS+/Ey80+vuS4hZOx/EV0nwlNlfI6U834DHnG++2+A4eT842Vfs4I SFQB8LMNauI4xR58qGVVZ6KupfVDvhvQxLUJjNB0SLJU9kHw+yOUQrTehCWwGBRQRYyj Bm6D5DLo/54zxW6TrcJyy7B3bVYm85euThN3gY7S1x60MBsEWTg0+e5bjDX4mKDSqkxi 4iSaYwH6bsVlEk5E5+XEPho31k5MRxyS1rW6pW1/+SrmJncFpbKBfwqva4O9x78gv02u +W8lKTY5O8O/bHHpDths5+QuiTyeBjgyAUijtgAqYDBxDIKwVpJyuQkaRJKAhZYuBq1W fa2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=mL1Sewb4; 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 s14si4133486edr.554.2021.04.19.06.21.07; Mon, 19 Apr 2021 06:21:07 -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=mL1Sewb4; 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 S240909AbhDSNVd (ORCPT + 12 others); Mon, 19 Apr 2021 09:21:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:53186 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240919AbhDSNTd (ORCPT ); Mon, 19 Apr 2021 09:19:33 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 27F17613E7; Mon, 19 Apr 2021 13:15:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618838113; bh=0DKbLwpRtrE8G4XtVlLlfF7mDlBZ8+CTdiglRTavET0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mL1Sewb4Muz6hwkrMBVvonvlDSmm+xE6gKC86XLsN9oWuNfnqMzVz/x3CwVUQ+4Hs r1TeiqrxQ+I6GMOjDECOJwWNdIOUiTb2Q6r5Af3Y9PFt2sksCEaw9Mx2csMorEi5k7 kmodviY14WOfQ5GOdiGq8/Gs8QubN1nxHucaWrtg= 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.10 048/103] Input: i8042 - fix Pegatron C15B ID entry Date: Mon, 19 Apr 2021 15:05:59 +0200 Message-Id: <20210419130529.470187442@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419130527.791982064@linuxfoundation.org> References: <20210419130527.791982064@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 */