Changeset 45bf63c in mainline for uspace/drv/bus/usb/uhci/hc.c

Timestamp:

2011-10-30T15:35:36Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

20a3465, 3ce78580

Parents:

1737bfb (diff), e978ada (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 USB branch.

Cleanup libusbhost interfaces.
Fix few possible memory corruption/crashes and memory leaks.
Add device_remove hooks for usbflbk, usbhid.

File:

• uspace/drv/bus/usb/uhci/hc.c (modified) (1 diff)

uspace/drv/bus/usb/uhci/hc.c

@@ -192 +192 @@
             "Device registers at %p (%zuB) accessible.\n", io, reg_size);
 
-        ret = hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11,
+        ret = hc_init_mem_structures(instance);
+        CHECK_RET_RETURN(ret,
+            "Failed to initialize UHCI memory structures: %s.\n",
+            str_error(ret));
+
+#undef CHECK_RET_RETURN
+
+        hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11,
             bandwidth_count_usb11);
-        CHECK_RET_RETURN(ret, "Failed to initialize HCD generic driver: %s.\n",
-            str_error(ret));
 
         instance->generic.private_data = instance;
         instance->generic.schedule = hc_schedule;
         instance->generic.ep_add_hook = NULL;
-
-#undef CHECK_RET_DEST_FUN_RETURN
-
-        ret = hc_init_mem_structures(instance);
-        if (ret != EOK) {
-                usb_log_error(
-                    "Failed to initialize UHCI memory structures: %s.\n",
-                    str_error(ret));
-                hcd_destroy(&instance->generic);
-                return ret;
-        }
 
         hc_init_hw(instance);