Changeset 26e7d6d in mainline for uspace/drv/bus/usb/usbhid/main.c

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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 mainline changes

File:

• uspace/drv/bus/usb/usbhid/main.c (moved) (moved from uspace/drv/usbhid/main.c ) (1 diff)

uspace/drv/bus/usb/usbhid/main.c

@@ -93 +93 @@
         if (rc != EOK) {
                 usb_log_error("Failed to initialize USB/HID device.\n");
-                usb_hid_free(&hid_dev);
+                usb_hid_destroy(hid_dev);
                 return rc;
         }