From patchwork Mon Apr 26 07:29:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 427514 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3457785jao; Mon, 26 Apr 2021 00:31:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQp1OrAYtDfkogCY9ZTkuzL2bzZ9sJatL05Mqt8tcsPGXF75PT9Xd6T/H7xjEx/CvIgVwo X-Received: by 2002:a17:90a:a781:: with SMTP id f1mr20250592pjq.57.1619422270541; Mon, 26 Apr 2021 00:31:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619422270; cv=none; d=google.com; s=arc-20160816; b=SvFq0qRX/7vIHfz+VskhPa8k2NEpA9/MT0LddwWF85hVrMOihW5qSHFfhPcpEvo2AG Zajd4vH8WDUESS/tit2zGkZrMeAchrn26S36+pKcstjr1INeZkH/J4I7x/ggd7qD1M7N ogN6lT434hjrzIrPtAyGN/gL7EHzwa2Pa1BihvdtSmBQETMH8L8GTkV1XmmGaAHrbCqk nVFyPICfCTqI3hTkFdna9heHKMgwq962UyKvuZ9OMZ41dbQjgc4f0vaOjEbM0z3+mauH U4A1R2puQYcjhCfAX8Nuzb3Z/XKvpvGE4Nex7RI8EB3jgXX4dzeIKsB7/poa4GtlCzxd p+XQ== 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=u3IYF/PcRIDNhr4BuuTETYYYI8S5SXVZe8JxcJntRA4HFzqrdMpms1dIuczOkHO4Bo x7e598C9cfJYd4v8qalzRufEH9Vf6xX7XLNCEBiOzZjMfOTsfYHQw7zAw3gOABIjsinu E2rkGb67DfgzZW9OCsml1bvRkZdrAzTQminWZdfiI3dXOQo60Qhc5AJQtYrDqC3sSlLu 9b6s+jEe3wjfwkLt1wnxW35HtEWqzCJ2MAyFYF+qG8zcfD9pk3K/Tf39bbjCE6xp8UcB s+fyZTnQ/hqOhVWtMHQa2PyG3EsACbd5LdZBNm1y5w3Az9wYvkwluYqsk6sxjaQ5vKJg eIbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2YSbn93D; 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 k15si16759290pll.39.2021.04.26.00.31.10; Mon, 26 Apr 2021 00:31:10 -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=2YSbn93D; 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 S232259AbhDZHbu (ORCPT + 12 others); Mon, 26 Apr 2021 03:31:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:42124 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232266AbhDZHbs (ORCPT ); Mon, 26 Apr 2021 03:31:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 14FA7611C0; Mon, 26 Apr 2021 07:31:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619422267; bh=cb/WSjGhZm9qsYRe4EugrntntQRK3N9XOP/ZsHZsCME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2YSbn93DoVor7TuJlfOL3Cr3WrIiJp11PwvMBcWam9ZXo8QWfdz3cW1GHakZkQpQY jp6LkrRn2nFlyERoQeAtsJWG6LAnIRZHg1df9cxuGmumZqIqR03TotCZ64ynHi7Kn6 4qFMj5ctikKx8Pd7LqcxS+hTn8M2VZmXrX1c/W3k= 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.4 17/32] Input: i8042 - fix Pegatron C15B ID entry Date: Mon, 26 Apr 2021 09:29:15 +0200 Message-Id: <20210426072817.174624360@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210426072816.574319312@linuxfoundation.org> References: <20210426072816.574319312@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 */