diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-09 13:32:31 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-09 13:32:31 -0400 |
| commit | 3e99e442f6906be98ed5398023f0eabab1165001 (patch) | |
| tree | 14d674e01c9663b5298999455dd9709e8e895671 | |
| parent | 1ea79ee0a4e7de7c2b0b942215e6550dfe1aae44 (diff) | |
| download | kernel-3e99e442f6906be98ed5398023f0eabab1165001.tar.gz kernel-3e99e442f6906be98ed5398023f0eabab1165001.tar.xz kernel-3e99e442f6906be98ed5398023f0eabab1165001.zip | |
Fix touchpad for Thinkpad S540 (rhbz 1223051)
| -rw-r--r-- | Input-synaptics-add-min-max-quirk-for-Lenovo-S540.patch | 39 | ||||
| -rw-r--r-- | kernel.spec | 9 |
2 files changed, 48 insertions, 0 deletions
diff --git a/Input-synaptics-add-min-max-quirk-for-Lenovo-S540.patch b/Input-synaptics-add-min-max-quirk-for-Lenovo-S540.patch new file mode 100644 index 00000000..51464771 --- /dev/null +++ b/Input-synaptics-add-min-max-quirk-for-Lenovo-S540.patch @@ -0,0 +1,39 @@ +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon, 8 Jun 2015 10:17:32 -0700 +Subject: [PATCH] Input: synaptics - add min/max quirk for Lenovo S540 + +https://bugzilla.redhat.com/show_bug.cgi?id=1223051#c2 + +Cc: stable@vger.kernel.org +Tested-by: tommy.gagnes@gmail.com +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> +--- + drivers/input/mouse/synaptics.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c +index c69b308beb3f..7d5f31fba535 100644 +--- a/drivers/input/mouse/synaptics.c ++++ b/drivers/input/mouse/synaptics.c +@@ -151,6 +151,11 @@ static const struct min_max_quirk min_max_pnpid_table[] = { + 1024, 5112, 2024, 4832 + }, + { ++ (const char * const []){"LEN2000", NULL}, ++ {ANY_BOARD_ID, ANY_BOARD_ID}, ++ 1024, 5113, 2021, 4832 ++ }, ++ { + (const char * const []){"LEN2001", NULL}, + {ANY_BOARD_ID, ANY_BOARD_ID}, + 1024, 5022, 2508, 4832 +@@ -191,7 +196,7 @@ static const char * const topbuttonpad_pnp_ids[] = { + "LEN0045", + "LEN0047", + "LEN0049", +- "LEN2000", ++ "LEN2000", /* S540 */ + "LEN2001", /* Edge E431 */ + "LEN2002", /* Edge E531 */ + "LEN2003", diff --git a/kernel.spec b/kernel.spec index 39c87ded..cc483828 100644 --- a/kernel.spec +++ b/kernel.spec @@ -615,6 +615,9 @@ Patch26219: firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch #rhbz 1226743 Patch26221: drm-i915-turn-off-wc-mmaps.patch +#rhbz 1223051 +Patch26230: Input-synaptics-add-min-max-quirk-for-Lenovo-S540.patch + # END OF PATCH DEFINITIONS %endif @@ -1348,6 +1351,9 @@ ApplyPatch firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch #rhbz 1226743 ApplyPatch drm-i915-turn-off-wc-mmaps.patch +#rhbz 1223051 +ApplyPatch Input-synaptics-add-min-max-quirk-for-Lenovo-S540.patch + # END OF PATCH APPLICATIONS %endif @@ -2212,6 +2218,9 @@ fi # # %changelog +* Tue Jun 09 2015 Josh Boyer <jwboyer@fedoraproject.org> +- Fix touchpad for Thinkpad S540 (rhbz 1223051) + * Mon Jun 08 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc7.git0.1 - Linux v4.1-rc7 |