From: Benjamin Tissoires Date: Thu, 24 Jul 2014 19:47:47 +0000 (-0700) Subject: Input: Revert "wacom - testing result shows get_report is unnecessary." X-Git-Tag: v5.15~74^2~949^2~36 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3cb83157e83bf82883e136240c7e059b7d9e29d1;p=platform%2Fkernel%2Flinux-starfive.git 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 Signed-off-by: Aristeu Rozanski Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index 2c613cd..72b1724 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);