Changeset 1181249 in mainline

Timestamp:

2011-05-06T08:34:20Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

166c4752

Parents:

10849ffc (diff), 310c4df (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:

Fixes from development

Location:

uspace/drv/usbhid

Files:

• kbd/kbddev.c (modified) (1 diff)
• mouse/mousedev.c (modified) (1 diff)

uspace/drv/usbhid/kbd/kbddev.c

@@ -1046 +1046 @@
                 free((*kbd_dev)->led_data);
         }
-        if ((*kbd_dev)->output_buffer != NULL) {
-                free((*kbd_dev)->output_buffer);
-        }
         if ((*kbd_dev)->led_path != NULL) {
                 usb_hid_report_path_free((*kbd_dev)->led_path);

uspace/drv/usbhid/mouse/mousedev.c

@@ -268 +268 @@
             USB_HID_REPORT_TYPE_INPUT);
 
-        if (field != NULL) {
+        while (field != NULL) {
                 usb_log_debug(NAME " VALUE(%X) USAGE(%X)\n", field->value, 
                     field->usage);