Changeset efdfebc in mainline for uspace/lib/usbdev/src/hub.c

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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/lib/usbdev/src/hub.c (modified) (2 diffs)

uspace/lib/usbdev/src/hub.c

@@ -63 +63 @@
                 return EBADMEM;
         return usb_hc_bind_address(connection,
-            attached_device->address, attached_device->fun->handle);
+            attached_device->address, ddf_fun_get_handle(attached_device->fun));
 }
 
@@ -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);