Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp4157774pxv; Mon, 19 Jul 2021 18:46:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwvYlGgFKWqj9TJfzafcyyF2R4oRJMNR3XAvCR0uN8gNRTn5rCApQkYAxO8STiRLEDaPKQ4 X-Received: by 2002:a05:6638:1383:: with SMTP id w3mr24546816jad.32.1626745595948; Mon, 19 Jul 2021 18:46:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626745595; cv=none; d=google.com; s=arc-20160816; b=XqtJnweaqZhqa9znCZdLeh061bxk/T//lQWIxhPuOX63xQrzGCzdcen4b8cm/jOBVa GQ6Eugcg/CXnShADPy2v+diudZPyB407CG8ndQjrKrY5Wv0SHBjuYBPWunUhYq3wrq1o NOHLWMXVSaGp1u6WGCIYyLI1f9kgAd0nxYLHhOqcEQt6Hx81DPmKdGCi+E+glWKjJHGo yjzOpoZyH8bCe0LPGiMQLqSX9/+iCkWRpJkMwwjYPzDV3Pgiwyfi+lhGmdQzhZZv2vuG lOo7orloOR64WXPnPbmcHd/50HcBwDAy6rlstP7lmtq2QB6b1V5ucz7j9AXBPA1ebUXJ VJGg== 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=G3s4OBwNBn3/jWS2Fj5KJ12fR3qC4kyBxS6hy1xP7FA=; b=W1EwH2s3LkTHkBsDx2LhCUkivWe6jbIsKHPMMD3pchCWE7x5o+nRfN9IK/lrrjU+R9 LorLXEs9sV3hx0YgaLFVGj0UmsYTzdZ4ON/G4KDmCXzwuh8cRMhRAWd1JKHMqT+6CSp4 9PClasfoFAlsbhzXl+Dz4ow2PfgxCO7mkz5j1RgsByWYU1zeWRK/ZIBTx5/Tugi9M7V/ Tg/jMLCfZk+Dg+fs6RoAfNWAC9+l337V9/hRESSWBiexsc4+/pessc85Fqq8d1lNVK9J TUsZtXM8yppgvPEfnWBuXG1PkP4XAUieOySIW1wzoJiHwCnoyiGWTK+PHznsgrBcuNcz G96A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=F1ISWxV6; 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 p16si12552233jan.14.2021.07.19.18.46.23; Mon, 19 Jul 2021 18:46:35 -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=F1ISWxV6; 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 S1345282AbhGSPA3 (ORCPT + 99 others); Mon, 19 Jul 2021 11:00:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:55058 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245547AbhGSOjQ (ORCPT ); Mon, 19 Jul 2021 10:39:16 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3887A6113C; Mon, 19 Jul 2021 15:18:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626707916; bh=kTVddoRfG4DNgDSYwVJCYQv5jeIAYXyncwB1agdGmCs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F1ISWxV6rYwi7nVXAtgB9Q3qQCirEc0bT82YEjFLBUqGVtalLleXEU3JO8WJJ5wII u0HDqMKAmoDDHyYSa1KXF/H89mgaQv5JQepT0GyNrXcPEWZYPCYk1dM7hkqiVjqPei hMxDj8eOv8KDHvLHUIHpWUEddKTy/vGfPL9PPzKc= 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 4.14 073/315] HID: wacom: Correct base usage for capacitive ExpressKey status bits Date: Mon, 19 Jul 2021 16:49:22 +0200 Message-Id: <20210719144945.269761311@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144942.861561397@linuxfoundation.org> References: <20210719144942.861561397@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 d2fe7af2c152..55b542a6a66b 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h @@ -121,7 +121,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