diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-06-25 08:37:51 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-06-25 08:45:26 -0400 |
| commit | f60cfbfce4bcfd4da5c46b51a5b18939dedf65fd (patch) | |
| tree | d55887d8ce82fcb4b1e31c1d5b55fb3cff9ea600 | |
| parent | 350873ee73f411b3fef593afc04479794578fe77 (diff) | |
| download | kernel-f60cfbfce4bcfd4da5c46b51a5b18939dedf65fd.tar.gz kernel-f60cfbfce4bcfd4da5c46b51a5b18939dedf65fd.tar.xz kernel-f60cfbfce4bcfd4da5c46b51a5b18939dedf65fd.zip | |
Revert commit that breaks Wacom Intuos4 from Benjamin Tissoires
| -rw-r--r-- | kernel.spec | 7 | ||||
| -rw-r--r-- | revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch | 40 |
2 files changed, 47 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index abd3bc52..b4d8aa25 100644 --- a/kernel.spec +++ b/kernel.spec @@ -643,6 +643,8 @@ Patch25105: x86_32-signal-Fix-vdso-rt_sigreturn.patch #CVE-2014-4508 rhbz 1111590 1112073 Patch25106: x86_32-entry-Do-syscall-exit-work-on-badsys.patch +Patch25109: revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch + # END OF PATCH DEFINITIONS %endif @@ -1365,6 +1367,8 @@ ApplyPatch x86_32-signal-Fix-vdso-rt_sigreturn.patch #CVE-2014-4508 rhbz 1111590 1112073 ApplyPatch x86_32-entry-Do-syscall-exit-work-on-badsys.patch +ApplyPatch revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch + # END OF PATCH APPLICATIONS %endif @@ -2237,6 +2241,9 @@ fi # ||----w | # || || %changelog +* Wed Jun 25 2014 Josh Boyer <jwboyer@fedoraproject.org> +- Revert commit that breaks Wacom Intuos4 from Benjamin Tissoires + * Tue Jun 24 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.16.0-0.rc2.git1.1 - Linux v3.16-rc2-35-g8b8f5d971584 - Reenable debugging options. diff --git a/revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch b/revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch new file mode 100644 index 00000000..f9f4a72a --- /dev/null +++ b/revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch @@ -0,0 +1,40 @@ +Bugzilla: N/A +Upstream-status: Sent upstream + +This reverts commit 1b2faaf7e219fc2905d75afcd4c815e5d39eda80. + +The Intuos4 series presents a bug in which it hangs if it receives +a set feature command while switching to the enhanced mode. +This bug is triggered when plugging an Intuos 4 while having +a gnome user session up and running. + +Signed-off-by: Benjamin Tissoires <benjamin.tissoires@xxxxxxxxxx> +--- + +Hi Aris, + +actually, you bisected the bug, so can I consider that I have your signed-off-by? + +Cheers, +Benjamin + + drivers/input/tablet/wacom_sys.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c +index 7087b33..319a3ff 100644 +--- a/drivers/input/tablet/wacom_sys.c ++++ b/drivers/input/tablet/wacom_sys.c +@@ -536,6 +536,9 @@ static int wacom_set_device_mode(struct usb_interface *intf, int report_id, int + + error = wacom_set_report(intf, WAC_HID_FEATURE_REPORT, + report_id, rep_data, length, 1); ++ if (error >= 0) ++ error = wacom_get_report(intf, WAC_HID_FEATURE_REPORT, ++ report_id, rep_data, length, 1); + } while ((error < 0 || rep_data[1] != mode) && limit++ < WAC_MSG_RETRIES); + + kfree(rep_data); +-- +1.9.0 + |