diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2014-07-24 12:47:47 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-25 18:53:45 -0700 |
| commit | 3cb83157e83bf82883e136240c7e059b7d9e29d1 (patch) | |
| tree | fd20b9a3ba0fc353480cfd58dc08459e9f33a118 | |
| parent | 9a3c4145af32125c5ee39c0272662b47307a8323 (diff) | |
| download | linux-stable-3cb83157e83bf82883e136240c7e059b7d9e29d1.tar.gz linux-stable-3cb83157e83bf82883e136240c7e059b7d9e29d1.tar.bz2 linux-stable-3cb83157e83bf82883e136240c7e059b7d9e29d1.zip | |
Input: Revert "wacom - testing result shows get_report is unnecessary."
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@redhat.com>
Signed-off-by: Aristeu Rozanski <aris@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| -rw-r--r-- | drivers/input/tablet/wacom_sys.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index 2c613cd41dd6..72b1724ac7d0 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); |