Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp2707788pxv; Sun, 11 Jul 2021 23:22:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/pwm3d1YI92zD26aKpPPHhCfIQEdRbFZooctjSB79/hTfCieSydjMmiU2pCwabUROlSNI X-Received: by 2002:a92:7a02:: with SMTP id v2mr13951902ilc.232.1626070959093; Sun, 11 Jul 2021 23:22:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626070959; cv=none; d=google.com; s=arc-20160816; b=sc9l4U00OMDQhUlyXTAz26YVIUbbXRFc1bKXsjFskzMvjKwzQooT3+5YQ0yPYwkP2c EXJAQbkpB5PSlb3fQBlgIJm5XOLPcOFCdSMW9NZx/sFAb1iuThJLg2TQiKLBn9wIo7z3 GHTXjHjKK75x+FlJwfRh4f5z2w256rlbspsF9VFL5OGuPtGVac2dBwPJ4Tl4TdTWB5Lx L3VeQjsC1qX4IlmjBfZTpNilxl2Ux2G/Ss0GVv607BhhtvGO6W5HeZpvfYFpYK52iL5E IOzXhtGSbP+CvmbGMTOpGJ/3kQFaqLFlICP4zGYKcy5q0TRCxz3oUNhPDMAL3hxvuF+9 ubxg== 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=hzbze4K/z5omR/zIOUdCGudcrMeZR8chuiNv08aoA9e5IvJ7gMdU8VLJS8ctlZ6WqN amc+C5DLJsapKNBzpW09Gh2BHn5R3Kh6V5yUi6XvCQQ+lUDowwpsqIyLXlL3ELm6ekb5 jntgK9A0lJ4+rO2OYZx9/eu4twS3qVNWhSkjm1aOb/+Rx5NGvxYL1fgY5Ngb8aL6GWM/ Lx+QnThRY4wPRBe8nZDEqb8jcCHfmGt0ibNz/jG6aM3tzfeuxNIXNJvTC976VCUCxyxJ jyx7J4nVPN4UBvfIUvDvOLciR5FJX/MAm3asoZgeX878GYVrX84dT+AtPJTXbqCdoVcS yFXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=CTFSvcR0; 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 p5si16824864jal.76.2021.07.11.23.22.27; Sun, 11 Jul 2021 23:22:39 -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=CTFSvcR0; 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 S234236AbhGLGXh (ORCPT + 99 others); Mon, 12 Jul 2021 02:23:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:39102 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234393AbhGLGW3 (ORCPT ); Mon, 12 Jul 2021 02:22:29 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 31CBA61154; Mon, 12 Jul 2021 06:19:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626070766; bh=IH4lhPDpvxmWg2bAKUCN01/Ju1RnAolEGFYrWtFY018=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CTFSvcR0YvilXRN0Cntlg6hTfCKKxocya5HGNO6/kxRCyjNE/kJDyooPCUUS+OqxW IriN9zMgJCQ+/ZhSEAJ1yVswU1TVtZ0fok+pzu5wLussxbG0rklA1TefDGvcvkRlur 7IY/V14KNoP09JP7Y0PYnyf5AsmWt/5Sijdln1Tw= 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.4 132/348] HID: wacom: Correct base usage for capacitive ExpressKey status bits Date: Mon, 12 Jul 2021 08:08:36 +0200 Message-Id: <20210712060718.801610241@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060659.886176320@linuxfoundation.org> References: <20210712060659.886176320@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