Changeset 113093a in mainline for uspace/lib

Timestamp:

2011-09-24T21:39:41Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1924bd43, f9d8c3a

Parents:

b3bf143 (diff), 024fcc5 (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 from lp:~vojtech-horky/helenos/usb

• Fixed #349 (usbhid hit a malloc assertion when mouse is moved for the first time)
• Fixed #377 (Console dies on a keypress of USB keyboard when in kconsole)
• Added another virtual USB HID (Logitech Wireless)

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;
         }