summaryrefslogtreecommitdiffstats
path: root/revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch
diff options
context:
space:
mode:
Diffstat (limited to 'revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch')
-rw-r--r--revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch40
1 files changed, 40 insertions, 0 deletions
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
+