diff options
author | Stefan Achatz <erazor_de@users.sourceforge.net> | 2013-10-28 13:52:03 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-04 13:57:34 -0500 |
commit | 405052f57cb5f3b7e6042c36c952d3980375fd5b (patch) | |
tree | 66f21d46f2a42433025cb98a21a8cc495bae18ab | |
parent | d8f0a31aa3ccf94e1902ff6c0c68410e3b68ecca (diff) |
HID: roccat: add new device return value
commit 14fc4290df2fb94a28f39dab9ed32feaa5527bef upstream.
Ryos uses a new return value for critical errors, others have been
confirmed.
Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/hid/hid-roccat-common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/hid/hid-roccat-common.c b/drivers/hid/hid-roccat-common.c index 74f704032627..e84089998900 100644 --- a/drivers/hid/hid-roccat-common.c +++ b/drivers/hid/hid-roccat-common.c | |||
@@ -65,10 +65,11 @@ int roccat_common2_send(struct usb_device *usb_dev, uint report_id, | |||
65 | EXPORT_SYMBOL_GPL(roccat_common2_send); | 65 | EXPORT_SYMBOL_GPL(roccat_common2_send); |
66 | 66 | ||
67 | enum roccat_common2_control_states { | 67 | enum roccat_common2_control_states { |
68 | ROCCAT_COMMON_CONTROL_STATUS_OVERLOAD = 0, | 68 | ROCCAT_COMMON_CONTROL_STATUS_CRITICAL = 0, |
69 | ROCCAT_COMMON_CONTROL_STATUS_OK = 1, | 69 | ROCCAT_COMMON_CONTROL_STATUS_OK = 1, |
70 | ROCCAT_COMMON_CONTROL_STATUS_INVALID = 2, | 70 | ROCCAT_COMMON_CONTROL_STATUS_INVALID = 2, |
71 | ROCCAT_COMMON_CONTROL_STATUS_WAIT = 3, | 71 | ROCCAT_COMMON_CONTROL_STATUS_BUSY = 3, |
72 | ROCCAT_COMMON_CONTROL_STATUS_CRITICAL_NEW = 4, | ||
72 | }; | 73 | }; |
73 | 74 | ||
74 | static int roccat_common2_receive_control_status(struct usb_device *usb_dev) | 75 | static int roccat_common2_receive_control_status(struct usb_device *usb_dev) |
@@ -88,13 +89,12 @@ static int roccat_common2_receive_control_status(struct usb_device *usb_dev) | |||
88 | switch (control.value) { | 89 | switch (control.value) { |
89 | case ROCCAT_COMMON_CONTROL_STATUS_OK: | 90 | case ROCCAT_COMMON_CONTROL_STATUS_OK: |
90 | return 0; | 91 | return 0; |
91 | case ROCCAT_COMMON_CONTROL_STATUS_WAIT: | 92 | case ROCCAT_COMMON_CONTROL_STATUS_BUSY: |
92 | msleep(500); | 93 | msleep(500); |
93 | continue; | 94 | continue; |
94 | case ROCCAT_COMMON_CONTROL_STATUS_INVALID: | 95 | case ROCCAT_COMMON_CONTROL_STATUS_INVALID: |
95 | 96 | case ROCCAT_COMMON_CONTROL_STATUS_CRITICAL: | |
96 | case ROCCAT_COMMON_CONTROL_STATUS_OVERLOAD: | 97 | case ROCCAT_COMMON_CONTROL_STATUS_CRITICAL_NEW: |
97 | /* seems to be critical - replug necessary */ | ||
98 | return -EINVAL; | 98 | return -EINVAL; |
99 | default: | 99 | default: |
100 | dev_err(&usb_dev->dev, | 100 | dev_err(&usb_dev->dev, |