Changeset ffa96c2 in mainline for uspace/drv/bus/usb/vhc/hub.c

Timestamp:

2014-07-25T17:52:58Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a861ccb3

Parents:

b5111c46

Message:

Convert libusbdev away from DDF_DATA_IMPLANT.

File:

• uspace/drv/bus/usb/vhc/hub.c (modified) (1 diff)

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

@@ -114 +114 @@
 
         ddf_fun_t *hub_dev;
-        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);
+
+        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);
         if (rc != EOK) {
                 usb_log_fatal("Failed to create root hub: %s.\n",
                     str_error(rc));
+                ddf_fun_destroy(hub_dev);
         }