42 lines
1.2 KiB
Diff
42 lines
1.2 KiB
Diff
From 0e8b2c3f6a8a13ec365bf47421fbc854d073b8a1 Mon Sep 17 00:00:00 2001
|
|
From: Josh Boyer <jwboyer@fedoraproject.org>
|
|
Date: Tue, 29 Sep 2015 08:23:29 -0400
|
|
Subject: [PATCH] Revert "Input: synaptics - fix handling of disabling gesture
|
|
mode"
|
|
|
|
This reverts commit e51e38494a8ecc18650efb0c840600637891de2c.
|
|
---
|
|
drivers/input/mouse/synaptics.c | 12 ++++--------
|
|
1 file changed, 4 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
|
|
index 994ae7886156..6025eb430c0a 100644
|
|
--- a/drivers/input/mouse/synaptics.c
|
|
+++ b/drivers/input/mouse/synaptics.c
|
|
@@ -519,18 +519,14 @@ static int synaptics_set_mode(struct psmouse *psmouse)
|
|
struct synaptics_data *priv = psmouse->private;
|
|
|
|
priv->mode = 0;
|
|
-
|
|
- if (priv->absolute_mode) {
|
|
+ if (priv->absolute_mode)
|
|
priv->mode |= SYN_BIT_ABSOLUTE_MODE;
|
|
- if (SYN_CAP_EXTENDED(priv->capabilities))
|
|
- priv->mode |= SYN_BIT_W_MODE;
|
|
- }
|
|
-
|
|
- if (!SYN_MODE_WMODE(priv->mode) && priv->disable_gesture)
|
|
+ if (priv->disable_gesture)
|
|
priv->mode |= SYN_BIT_DISABLE_GESTURE;
|
|
-
|
|
if (psmouse->rate >= 80)
|
|
priv->mode |= SYN_BIT_HIGH_RATE;
|
|
+ if (SYN_CAP_EXTENDED(priv->capabilities))
|
|
+ priv->mode |= SYN_BIT_W_MODE;
|
|
|
|
if (synaptics_mode_cmd(psmouse, priv->mode))
|
|
return -1;
|
|
--
|
|
2.4.3
|
|
|