Changeset 132ab5d1 in mainline for uspace/lib/usbdev

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/usbdev/src/recognise.c (modified) (1 diff)

uspace/lib/usbdev/src/recognise.c

@@ -88 +88 @@
                 char *str = NULL; \
                 int __rc = asprintf(&str, format, ##__VA_ARGS__); \
-                if (__rc > 0) { \
-                        __rc = usb_add_match_id((match_ids), (score), str); \
-                } \
-                if (__rc != EOK) { \
-                        free(str); \
-                        return __rc; \
+                if (__rc >= 0) { \
+                        int __rc = usb_add_match_id((match_ids), (score), str); \
+                        if (__rc != EOK) { \
+                                free(str); \
+                                return __rc; \
+                        } \
+                } else { \
+                        return ENOMEM; \
                 } \
         } while (0)