Changeset 132ab5d1 in mainline for uspace/lib/usbhid/src/hidparser.c

Timestamp:

2018-01-30T03:20:45Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/lib/usbhid/src/hidparser.c (modified) (2 diffs)

uspace/lib/usbhid/src/hidparser.c

@@ -36 +36 @@
 #include <errno.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <mem.h>
 #include <usb/debug.h>
@@ -518 +518 @@
 
                         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);