Changeset 1924bd43 in mainline for uspace/lib/usbhid/src/hidpath.c

Timestamp:

2011-09-25T12:07:26Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

5dd4f77a

Parents:

6fe0bf8d (diff), 113093a (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 with mainline

File:

• uspace/lib/usbhid/src/hidpath.c (modified) (1 diff)

uspace/lib/usbhid/src/hidpath.c

@@ -76 +76 @@
                                     int32_t usage_page, int32_t usage)
 {       
-        usb_hid_report_usage_path_t *item;
-
-        if(!(item=malloc(sizeof(usb_hid_report_usage_path_t)))) {
+        usb_hid_report_usage_path_t *item
+                = malloc(sizeof(usb_hid_report_usage_path_t));
+
+        if (item == NULL) {
                 return ENOMEM;
         }