Changes in uspace/lib/usbdev/src/hub.c [56fd7cf:6e3c005] in mainline

File:

• uspace/lib/usbdev/src/hub.c (modified) (5 diffs)

uspace/lib/usbdev/src/hub.c

@@ -33 +33 @@
  * Functions needed by hub drivers.
  */
-
 #include <usb/dev/hub.h>
 #include <usb/dev/pipes.h>
@@ -63 +62 @@
                 return EBADMEM;
         return usb_hc_bind_address(connection,
-            attached_device->address, ddf_fun_get_handle(attached_device->fun));
+            attached_device->address, attached_device->fun->handle);
 }
 
@@ -115 +114 @@
         return EOK;
 }
+
 
 /** Wrapper for registering attached device to the hub.
@@ -160 +160 @@
     ddf_dev_ops_t *dev_ops, void *new_dev_data, ddf_fun_t **new_fun)
 {
-        if ((new_fun == NULL) || (hc_conn == NULL))
+        if (new_fun == NULL || hc_conn == NULL)
                 return EINVAL;
 
@@ -287 +287 @@
         rc = usb_hub_register_device(hc_conn, &new_device);
         if (rc != EOK) {
+                /* We know nothing about that data. */
+                if (new_dev_data)
+                        child_fun->driver_data = NULL;
                 /* The child function is already created. */
                 ddf_fun_destroy(child_fun);