Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp2833902pxv; Mon, 12 Jul 2021 03:05:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzleZg35oJln8+dMfxPhCeco7Otrmsy1svon8UM1eId11Fq9zZuBas2p3UGdu0iw4Z+TTjH X-Received: by 2002:a92:6605:: with SMTP id a5mr39642521ilc.15.1626084342415; Mon, 12 Jul 2021 03:05:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626084342; cv=none; d=google.com; s=arc-20160816; b=yPd/jQY8azDKoGVjUvAlUDTGLpVyS6QnWVxeF3PtOFf/7dft4CU5rT4JDAH4gMc6hC Bp3/B89lUW6yOk/gZvWq4RTFIK6dyRXgl3ewdQrsKaMXerW69GO1c4L3G5kpRVWkJNkm ScSxI7un03jM1qYELthb7D0ZpZa6WB8Fd2LEjgATFF/7BRz1wVyV70EBB3C5UqOtRYTR 7F9CB0BQkJGmQTUhhXWkYJfVI3R/vwV9qKULaebKFXzLsxHjGKjqltGk0ieFkkQE+bkT iX2xP/+JYRlipAFef95U/JUk1CaCwTrFS9AAJgHh54KvZsL/w6koVlUs72RMx36zilYz 3ySQ== 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=su8lBz+34xH0JeRY16FEonn+sWbmoN9eF621Td2uxKfLojNTJNbDOx5xRZuW2ko7gp DU8p0qDaeGBlRBMOfPw9WtGjdwx27Dj6GOjBSUeiGTupujnd+cD+QD+bUF0ox3yKO/Fs 2WHSjBFPjQ/YRi8iwYbfSIhB6c2HcyI6+K9uveXRvJo1WMYuGFKW9VNnrOXyemMOBiIV 73Ft2ICDzy8FxQrrm1nlA8FV31lEM9oecHf8+iL/9gfgc6yxsrow5W9RvRuYgtNYdb+x Hq5yHNfXb6+Ti7vjeveIIUpPbBQ2AP97HWHuqILRtv5jwolUtBPAwT1BMy3ClBwkS3t2 b7eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=lBKtU+GH; 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 g3si9729313ile.55.2021.07.12.03.05.30; Mon, 12 Jul 2021 03:05:42 -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=lBKtU+GH; 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 S1344942AbhGLHfX (ORCPT + 99 others); Mon, 12 Jul 2021 03:35:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:42016 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242366AbhGLHGn (ORCPT ); Mon, 12 Jul 2021 03:06:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4A786610E5; Mon, 12 Jul 2021 07:03:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626073429; bh=IH4lhPDpvxmWg2bAKUCN01/Ju1RnAolEGFYrWtFY018=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lBKtU+GHzBhPTzZld6GmWY6JEffbcrlH0aMQR71W/ywLvU0LRgIwOfafW6Kol/lVm /gtNtHPWkyG93fHShKvQrdH3aDgbkiLxxOjxFd/a3Qgtz8Z4S7R8zn6I9kwnmHAp+u 1XAxe7WxRY3pDeiLP7Xhz/fH6uN3nYBWulsCDaEE= 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.12 239/700] HID: wacom: Correct base usage for capacitive ExpressKey status bits Date: Mon, 12 Jul 2021 08:05:22 +0200 Message-Id: <20210712061000.744992403@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060924.797321836@linuxfoundation.org> References: <20210712060924.797321836@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