summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Achatz <erazor_de@users.sourceforge.net>2013-10-28 13:52:03 -0400
committerJiri Kosina <jkosina@suse.cz>2013-10-30 09:17:30 -0400
commit14fc4290df2fb94a28f39dab9ed32feaa5527bef (patch)
tree053d920ef73e0beafd87d7d8fae8136abe37f24f
parent1c241131a126df9bfb930f27d2fe8887971af0c7 (diff)
HID: roccat: add new device return value
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>
-rw-r--r--drivers/hid/hid-roccat-common.c12
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,
65EXPORT_SYMBOL_GPL(roccat_common2_send); 65EXPORT_SYMBOL_GPL(roccat_common2_send);
66 66
67enum roccat_common2_control_states { 67enum 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
74static int roccat_common2_receive_control_status(struct usb_device *usb_dev) 75static 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,