diff options
| -rw-r--r-- | Revert-Input-synaptics-fix-handling-of-disabling-ges.patch | 41 | ||||
| -rw-r--r-- | kernel.spec | 6 |
2 files changed, 47 insertions, 0 deletions
diff --git a/Revert-Input-synaptics-fix-handling-of-disabling-ges.patch b/Revert-Input-synaptics-fix-handling-of-disabling-ges.patch new file mode 100644 index 000000000..2b962e11d --- /dev/null +++ b/Revert-Input-synaptics-fix-handling-of-disabling-ges.patch @@ -0,0 +1,41 @@ +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 + diff --git a/kernel.spec b/kernel.spec index c782eb57c..fd66c0d85 100644 --- a/kernel.spec +++ b/kernel.spec @@ -587,6 +587,9 @@ Patch509: ideapad-laptop-Add-Lenovo-Yoga-3-14-to-no_hw_rfkill-.patch Patch520: ARM-dts-Fix-Makefile-target-for-sun4i-a10-itead-itea.patch +#rhbz 1262434 +Patch521: Revert-Input-synaptics-fix-handling-of-disabling-ges.patch + Patch904: kdbus.patch # END OF PATCH DEFINITIONS @@ -2032,6 +2035,9 @@ fi # # %changelog +* Tue Sep 29 2015 Josh Boyer <jwboyer@fedoraproject.org> +- Revert upstream guesture disabling patch on synaptics (rhbz 1262434) + * Mon Sep 28 2015 Laura Abbott <labbott@redhat.com> - 4.3.0-0.rc3.git1.1 - Linux v4.3-rc3-40-g097f70b - Disable debugging options. |