Index: uspace/lib/usbhid/src/hiddescriptor.c
===================================================================
--- uspace/lib/usbhid/src/hiddescriptor.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
+++ uspace/lib/usbhid/src/hiddescriptor.c	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
@@ -75,4 +75,5 @@
 #define USB_HID_RESET_OFFSET	3
 
+#define USB_HID_INVALID                 -98
 /** Unknown tag was founded in report descriptor data*/
 #define USB_HID_UNKNOWN_TAG		-99
@@ -103,5 +104,5 @@
 		
 		if(usb_hid_report_compare_usage_path(path, cmp_path,
-					USB_HID_PATH_COMPARE_STRICT) == EOK){
+					USB_HID_PATH_COMPARE_STRICT) == 0){
 			break;
 		}
@@ -553,5 +554,5 @@
 
 		if((ret=usb_hid_report_parse_main_tag(tag, data, item_size,
-			report_item, usage_path)) == EOK) {
+			report_item, usage_path)) == 0) {
 
 			return USB_HID_NEW_REPORT_ITEM;
@@ -584,5 +585,5 @@
  * @param Length of data buffer
  * @param Current state table
- * @return Error code
+ * @return 0 or USB_HID_ code
  */
 
@@ -599,5 +600,5 @@
 	case USB_HID_REPORT_TAG_FEATURE:
 		report_item->item_flags = *data;			
-		return EOK;			
+		return 0;			
 		break;
 			
@@ -639,5 +640,5 @@
 	}
 
-	return EOK;
+	return 0;
 }
 
@@ -649,5 +650,5 @@
  * @param Length of data buffer
  * @param Current state table
- * @return Error code
+ * @return 0 or USB_HID_ code
  */
 int usb_hid_report_parse_global_tag(uint8_t tag, const uint8_t *data, 
@@ -725,5 +726,5 @@
 	}
 
-	return EOK;
+	return 0;
 }
 
@@ -735,5 +736,5 @@
  * @param Length of data buffer
  * @param Current state table
- * @return Error code
+ * @return 0 or USB_HID_ code
  */
 int usb_hid_report_parse_local_tag(uint8_t tag, const uint8_t *data,
@@ -791,5 +792,5 @@
 			    USB_HID_EXTENDED_USAGE_PAGE(
 			    usb_hid_report_tag_data_uint32(data, item_size))) {
-				return EINVAL;
+				return USB_HID_INVALID;
 			}
 			
@@ -862,5 +863,5 @@
 	}
 	
-	return EOK;
+	return 0;
 }
 
Index: uspace/lib/usbhid/src/hidparser.c
===================================================================
--- uspace/lib/usbhid/src/hidparser.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
+++ uspace/lib/usbhid/src/hidparser.c	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
@@ -531,5 +531,5 @@
 
 			if (usb_hid_report_compare_usage_path(
-			    field->collection_path, path, flags) == EOK) {
+			    field->collection_path, path, flags) == 0) {
 				usb_hid_report_remove_last_item(
 				    field->collection_path);
Index: uspace/lib/usbhid/src/hidpath.c
===================================================================
--- uspace/lib/usbhid/src/hidpath.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
+++ uspace/lib/usbhid/src/hidpath.c	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
@@ -191,5 +191,5 @@
  * @param flags       Flags determining the mode of comparison
  *
- * @return EOK if both paths are identical, non zero number otherwise
+ * @return 0 if both paths are identical, non zero number otherwise
  *
  */
@@ -213,5 +213,5 @@
 	// Empty path match all others
 	if (path->depth == 0) {
-		return EOK;
+		return 0;
 	}
 	
@@ -239,7 +239,7 @@
 					if (USB_HID_SAME_USAGE(report_item->usage,
 					    path_item->usage))
-						return EOK;
+						return 0;
 				} else {
-					return EOK;
+					return 0;
 				}
 			}
@@ -285,5 +285,5 @@
 		    ((report_link == &report_path->items.head) &&
 		    (path_link == &path->items.head))) {
-			return EOK;
+			return 0;
 		} else {
 			return 1;
@@ -297,5 +297,5 @@
 		
 		if (list_empty(&path->items)) {
-			return EOK;
+			return 0;
 		}
 		
@@ -320,5 +320,5 @@
 		
 		if (path_link == &path->items.head) {
-			return EOK;
+			return 0;
 		} else {
 			return 1;
@@ -327,5 +327,5 @@
 	
 	default:
-		return EINVAL;
+		return -1;
 	}
 }