From patchwork Mon Apr 26 07:29:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 427517 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3460146jao; Mon, 26 Apr 2021 00:35:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx4/QiW0S2b8m5LGNxnAfJYrd7ZyGX7NgOvr/i9zyHCGI0JPjZdkzAv8GjlfjTEoqUXwYbU X-Received: by 2002:a63:af03:: with SMTP id w3mr8975280pge.325.1619422546522; Mon, 26 Apr 2021 00:35:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619422546; cv=none; d=google.com; s=arc-20160816; b=ZFDJrELY8kuV8Uf1jvbxNYy3VAo88UAg/zk/2yvVzFbe5nA+/YDWvGGKWswVSxC1x4 H6Q/Al4YKg7fg3pA8XOH1wNN6PqRzmcRKaqmil1YqXpGcUvqxfPXubr0rharhEEC6Bi3 0uTjKvm6WEewfECVo9YFvadyBoScQGkuLXoUh/sKsIkQyvaA5NOt/z3Xs1hs0DUqcT63 0zf0v0t3vPxLLjLEeU8mq6K9uDCb2KMRSinM7RHSQC7YVkBiDNYFW88ztC3b/O9OQK1r 1A7GqlqI+il6PE3CsYUjP8PNsCvAJAXeFgIQwKIe3/2AAiIZbN9X2i/SMp2AGTIb7ILw Dd5A== 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=nyZ/v6PvJd2kdWLDesXVuxNvtnmbJS/HMUb8rm1SHEc=; b=F5LpmkzQYLi5ex24/PhBrl8D/zyZOlBBeKJvjSmmniltbdYdswZ1AXs1ma937usbRC t8YfZ9JFtNJM5639d0KZmYPgu+8HsEMN0hJ0KIo71xDUiBRmk0Q0BBt52U0/FN787SC1 I8VbFsLGPxxuESqro55/RNshbuQmmkmw2EeWw9KYkhCjmnLzVzgoCnB3KC+sFEWzRHeb cZoCmmbihPFiBKSm/3M3oK4NGO8AMcw7i9ydKsNUOftxXhfL27e3ZnxN0dDjl1btT0C1 XdTbQ8TTZ2r7V8xOuVWsb3AYOHbnwL3KEYEO9qNeKK1lqvjj8hebX+eFVMXGB1xHkRKC E/jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=AQrIjNba; 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 oc4si20537372pjb.147.2021.04.26.00.35.46; Mon, 26 Apr 2021 00:35:46 -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=AQrIjNba; 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 S232079AbhDZHgT (ORCPT + 12 others); Mon, 26 Apr 2021 03:36:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:46726 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232777AbhDZHeD (ORCPT ); Mon, 26 Apr 2021 03:34:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0F8E561077; Mon, 26 Apr 2021 07:33:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619422402; bh=cb/WSjGhZm9qsYRe4EugrntntQRK3N9XOP/ZsHZsCME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AQrIjNbaJ3Zh3klrmqaEaM2jTBRvSNgR7mU1+XrdjIpkq39m2dTJ4Jld7q5lJDyyd Qmvv8z5BAehC3c4h2gRaWEBCXfmEQNHkkeSLAhkhkbmTp7Tf6+d/Em535qZCwNQDRz HrvJjRZw/NOgAI78wFddvhSIfzJak/syk9RJbOlM= 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.9 17/37] Input: i8042 - fix Pegatron C15B ID entry Date: Mon, 26 Apr 2021 09:29:18 +0200 Message-Id: <20210426072817.835788879@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210426072817.245304364@linuxfoundation.org> References: <20210426072817.245304364@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 @@ -579,6 +579,7 @@ static const struct dmi_system_id i8042_ DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), DMI_MATCH(DMI_PRODUCT_NAME, "VGN-CS"), }, + }, { .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /* Convertible Notebook */