Changeset 15d0046 in mainline for uspace/drv/bus/usb/usbhub/port.c

Timestamp:

2014-09-12T13:22:33Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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/usbhub/port.c (modified) (2 diffs)

uspace/drv/bus/usb/usbhub/port.c

@@ -424 +424 @@
         ddf_fun_t *child_fun;
 
+        child_fun = ddf_fun_create(data->hub->usb_device->ddf_dev,
+            fun_inner, NULL);
+        if (child_fun == NULL)
+                return ENOMEM;
+
         const int rc = usb_hc_new_device_wrapper(data->hub->usb_device->ddf_dev,
-            &data->hub->usb_device->hc_conn, data->speed, enable_port_callback,
-            data->port, &new_address, NULL, NULL, &child_fun);
+            child_fun, &data->hub->usb_device->hc_conn, data->speed,
+            enable_port_callback, data->port, &new_address, NULL);
 
         if (rc == EOK) {
@@ -440 +445 @@
                     ddf_fun_get_handle(child_fun));
         } else {
+                ddf_fun_destroy(child_fun);
                 usb_log_error("Failed registering device on port %zu: %s.\n",
                     data->port->port_number, str_error(rc));