From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 6 May 2022 04:57:40 +0000 (+1000)
Subject: tablet: remove an always-true part of an if condition
X-Git-Tag: 1.21.0~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=374d32c6bed3433355c39bb17e5bf6a6545ee72c;p=platform%2Fupstream%2Flibinput.git

tablet: remove an always-true part of an if condition

A few lines north of here we return early if neither bit is set. If we
get to this point, at least one bit is set so this part of the condition
always evaluates to true.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---

diff --git a/src/evdev-tablet.c b/src/evdev-tablet.c
index 58cc46d8..7121328e 100644
--- a/src/evdev-tablet.c
+++ b/src/evdev-tablet.c
@@ -1257,8 +1257,6 @@ sanitize_pressure_distance(struct tablet_dispatch *tablet,
 
 	/* Keep distance and pressure mutually exclusive */
 	if (distance &&
-	    (bit_is_set(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_DISTANCE) ||
-	     bit_is_set(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_PRESSURE)) &&
 	    distance->value > distance->minimum &&
 	    pressure->value > pressure->minimum) {
 		if (tool_in_contact) {