Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp2826173pxv; Mon, 12 Jul 2021 02:54:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPb+hm6BLT4/uPf+0dXaSnf/Qn12ny9g8ECE8+GYRECO5bEZJ5efyMMFr05549DorcvUCc X-Received: by 2002:a05:6e02:120e:: with SMTP id a14mr12049021ilq.88.1626083660183; Mon, 12 Jul 2021 02:54:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626083660; cv=none; d=google.com; s=arc-20160816; b=n0WBXoARFajkjNw+b0ZVtIBouoPVLtSQtdKaz4iKsLwksjV2hyvm9SC9geQMbFVfBZ jDRPzgOh3zlxW1XdsxOPeR/i3sveGW9o1tgsVrAtOuCMnFywWuHORj6GDclTjcSt78Mf 6exrVVJYX3nTNmAAU+r0Ljc0syUhyIAHgR7zbOUtgMSfN4u8hGrOK2EVVZz/t/WrMsHF 1dJmIHEWakf5iZv43n52Q1btPkJeAc/17B9J2RQ//VIDyY/dUQevM79M6yCgXWDbelHu AX/qRSwL+mJVu+BIrXzbz/wqBScsiDZvgFt7dxCrwpcQo9Tn7i6ZesnMyB3us0gYOm1U C7HQ== 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=YzEnKoAN8wUe9Wza6nGdqKV5tUZkq0+rcrNE781AReY=; b=P08a6DGV2+EcQqx7KBqT6Az+zqyhAdnfTphvkjeXPREYMXjaNBlZ3vuk2gkWPUjZT5 Zns/7DUwmRwrclQgkTl/OeincNHxj9JfIfoUyiF6SErHd095Fy76INtDYdPOZLfglFXk dZ5XWj0M5esVSbjWdOXCFtY/Ywug9NTMafa1CFRiPz9gT1BuPVcNvTfs+wZyRSfe0Ap5 /V/YzpWzebo0PHrZsIC2J87fxfuPE0Z9XA71xlL1/LI84UAZ3VtGG5Qr8s3jxT5rKZ56 +ma3zonMLKParzjxbhMBHTBeBDuVCAC0GuKvHlvEvYWnIizKzRAWXTc8xZ6reOQENOzF aByw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=q3O65j94; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 g3si16658725ilc.117.2021.07.12.02.54.08; Mon, 12 Jul 2021 02:54:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=q3O65j94; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S241214AbhGLGyv (ORCPT + 99 others); Mon, 12 Jul 2021 02:54:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:33552 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238272AbhGLGkE (ORCPT ); Mon, 12 Jul 2021 02:40:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 39F0861008; Mon, 12 Jul 2021 06:36:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626071809; bh=IH4lhPDpvxmWg2bAKUCN01/Ju1RnAolEGFYrWtFY018=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q3O65j943J0R5jYaWI3r88hk1oHF8wXYbDPKplx8eHURtOThsV2i0Q0R7V2w0/ddc 6MpCb3mjaeq0VrgOPZbgXHJS7fS9hJj4E4FYBdMrZ24TugRVMxDBWvZH+nuV/V2yHQ CtGJa/VwZgfS5qc9KVPhTx9xu6jqpOBv5sbUcASE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jason Gerecke , Jiri Kosina , Sasha Levin Subject: [PATCH 5.10 202/593] HID: wacom: Correct base usage for capacitive ExpressKey status bits Date: Mon, 12 Jul 2021 08:06:02 +0200 Message-Id: <20210712060905.243514305@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jason Gerecke [ Upstream commit 424d8237945c6c448c8b3f23885d464fb5685c97 ] The capacitive status of ExpressKeys is reported with usages beginning at 0x940, not 0x950. Bring our driver into alignment with reality. Signed-off-by: Jason Gerecke Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/wacom_wac.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index 195910dd2154..e3835407e8d2 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h @@ -122,7 +122,7 @@ #define WACOM_HID_WD_TOUCHONOFF (WACOM_HID_UP_WACOMDIGITIZER | 0x0454) #define WACOM_HID_WD_BATTERY_LEVEL (WACOM_HID_UP_WACOMDIGITIZER | 0x043b) #define WACOM_HID_WD_EXPRESSKEY00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0910) -#define WACOM_HID_WD_EXPRESSKEYCAP00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0950) +#define WACOM_HID_WD_EXPRESSKEYCAP00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0940) #define WACOM_HID_WD_MODE_CHANGE (WACOM_HID_UP_WACOMDIGITIZER | 0x0980) #define WACOM_HID_WD_MUTE_DEVICE (WACOM_HID_UP_WACOMDIGITIZER | 0x0981) #define WACOM_HID_WD_CONTROLPANEL (WACOM_HID_UP_WACOMDIGITIZER | 0x0982) -- 2.30.2