Changes in uspace/drv/bus/usb/vhc/hub.c [ad22fa4:56fd7cf] in mainline

File:

• uspace/drv/bus/usb/vhc/hub.c (modified) (2 diffs)

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

@@ -94 +94 @@
 {
         ddf_fun_t *hc_dev = (ddf_fun_t *) arg;
+
+        /*
+         * Wait until parent device is properly initialized.
+         */
+        async_sess_t *sess;
+        do {
+                sess = devman_device_connect(EXCHANGE_SERIALIZE,
+                    ddf_fun_get_handle(hc_dev), 0);
+        } while (!sess);
+        async_hangup(sess);
+
         int rc;
 
@@ -103 +114 @@
 
         ddf_fun_t *hub_dev;
-
-        hub_dev = ddf_fun_create(ddf_fun_get_dev(hc_dev), fun_inner, NULL);
-        if (hub_dev == NULL) {
-                rc = ENOMEM;
-                usb_log_fatal("Failed to create root hub: %s.\n",
-                    str_error(rc));
-                return rc;
-        }
-
-        rc = usb_hc_new_device_wrapper(ddf_fun_get_dev(hc_dev), hub_dev,
-            &hc_conn, USB_SPEED_FULL, pretend_port_rest, NULL, NULL, &rh_ops);
+        rc = usb_hc_new_device_wrapper(ddf_fun_get_dev(hc_dev), &hc_conn, USB_SPEED_FULL,
+            pretend_port_rest, NULL, NULL, &rh_ops, hc_dev, &hub_dev);
         if (rc != EOK) {
                 usb_log_fatal("Failed to create root hub: %s.\n",
                     str_error(rc));
-                ddf_fun_destroy(hub_dev);
         }