From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A872BC3A5A3 for ; Tue, 27 Aug 2019 08:06:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C72E206BA for ; Tue, 27 Aug 2019 08:06:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566893204; bh=DLI2UQL4wEAh+RKhlUFokT65zPuIwUI3g+AXNMAYFhM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kfmL4iXiDJiSr+ESsSBj/dZw6QKQRTjlCbzPR4utOaD/p7LsQDJm2C+rqDiDDCNgy ERqhMATqxHpPISyPaz4iIR9M9g8XgJOIl1Py0t21cxpQyFfwDPUA+QkIm0sq498Set F/16JHzFfdDlLwTFDe501DAHBxmhGTshyEcXd+kY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732631AbfH0IGm (ORCPT ); Tue, 27 Aug 2019 04:06:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:36644 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732640AbfH0IGi (ORCPT ); Tue, 27 Aug 2019 04:06:38 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7BE20206BF; Tue, 27 Aug 2019 08:06:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566893198; bh=DLI2UQL4wEAh+RKhlUFokT65zPuIwUI3g+AXNMAYFhM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f5XcEnNRihOgy4TkozH0iHpyrIsF8kjV7Mpe8nKJ/bZvCVgPDb1BXprTf5kMgz1y9 E5u5vvgqbCOXI5xYlIFOfSfzQraQd3tyfBaRi6ngqBuumy+cgG9lO1nUyHIhNjgj6B fUxJS4noG8Tfab18y1yjdDg221RU8sX7btVcIhXY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jason Gerecke , Jiri Kosina Subject: [PATCH 5.2 112/162] HID: wacom: Correct distance scale for 2nd-gen Intuos devices Date: Tue, 27 Aug 2019 09:50:40 +0200 Message-Id: <20190827072742.275319262@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190827072738.093683223@linuxfoundation.org> References: <20190827072738.093683223@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jason Gerecke commit b72fb1dcd2ea9d29417711cb302cef3006fa8d5a upstream. Distance values reported by 2nd-gen Intuos tablets are on an inverted scale (0 == far, 63 == near). We need to change them over to a normal scale before reporting to userspace or else userspace drivers and applications can get confused. Ref: https://github.com/linuxwacom/input-wacom/issues/98 Fixes: eda01dab53 ("HID: wacom: Add four new Intuos devices") Signed-off-by: Jason Gerecke Cc: # v4.4+ Signed-off-by: Jiri Kosina Signed-off-by: Greg Kroah-Hartman --- drivers/hid/wacom_wac.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -846,6 +846,8 @@ static int wacom_intuos_general(struct w y >>= 1; distance >>= 1; } + if (features->type == INTUOSHT2) + distance = features->distance_max - distance; input_report_abs(input, ABS_X, x); input_report_abs(input, ABS_Y, y); input_report_abs(input, ABS_DISTANCE, distance);