Changeset 113093a in mainline for uspace/drv/bus/usb/vhc/connhost.c

Timestamp:

2011-09-24T21:39:41Z (13 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/drv/bus/usb/vhc/connhost.c (modified) (1 diff)

uspace/drv/bus/usb/vhc/connhost.c

@@ -440 +440 @@
         int rc = vhc_virtdev_add_transfer(vhc, transfer);
         if (rc != EOK) {
-                free(transfer->setup_buffer);
+                if (transfer->setup_buffer != NULL) {
+                        free(transfer->setup_buffer);
+                }
                 free(transfer);
                 return rc;