From: Jason Gerecke Date: Wed, 5 Aug 2015 22:45:30 +0000 (-0700) Subject: HID: wacom: Do not repeatedly attempt to set device mode on error X-Git-Tag: firefly_0821_release~176^2~1174^2~1^12~5 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=64d0ed94f5dfde5efac15941128f60edf7f15c17;p=firefly-linux-kernel-4.4.55.git HID: wacom: Do not repeatedly attempt to set device mode on error As an extension of aef3156d7, there is no sense in repeatedly calling the 'wacom_set_report' and 'wacom_get_report' functions if they return an error. Getting an error from them implies that the device is out to lunch: either a hard error code was returned or repeated attempts at recovering from a "soft" error all failed. In either case, doing even more retries is not likely to resolve whatever is wrong. Signed-off-by: Jason Gerecke Signed-off-by: Jiri Kosina --- diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 20d15c5fccec..6edb7d136476 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -335,7 +335,7 @@ static int wacom_set_device_mode(struct hid_device *hdev, int report_id, if (error >= 0) error = wacom_get_report(hdev, HID_FEATURE_REPORT, rep_data, length, 1); - } while ((error < 0 || rep_data[1] != mode) && limit++ < WAC_MSG_RETRIES); + } while (error >= 0 && rep_data[1] != mode && limit++ < WAC_MSG_RETRIES); kfree(rep_data);