Changeset 7cfe5c0 in mainline for uspace/drv/bus/usb/usbhub/port.c

Timestamp:

2012-08-20T19:16:24Z (13 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

6b99156

Parents:

b9cb911 (diff), 01e397ac (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:

Merged with mainline 0.5.0 changes.

File:

• uspace/drv/bus/usb/usbhub/port.c (modified) (1 diff)

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

@@ -436 +436 @@
                 usb_log_info("Detected new device on `%s' (port %zu), "
                     "address %d (handle %" PRIun ").\n",
-                    data->hub->usb_device->ddf_dev->name,
-                    data->port->port_number, new_address, child_fun->handle);
+                    ddf_dev_get_name(data->hub->usb_device->ddf_dev),
+                    data->port->port_number, new_address,
+                    ddf_fun_get_handle(child_fun));
         } else {
                 usb_log_error("Failed registering device on port %zu: %s.\n",