Changeset 5e718d9 in mainline for uspace/drv/bus/usb/usbhub/usbhub.c

Timestamp:

2012-08-21T10:04:16Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

67edca6

Parents:

0da6c04 (diff), 6a97f2e (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 with upstream (lp:~wtachi/helenos/bithenge)

File:

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

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

@@ -160 +160 @@
         hub_dev->running = true;
         usb_log_info("Controlling hub '%s' (%zu ports).\n",
-            hub_dev->usb_device->ddf_dev->name, hub_dev->port_count);
+            ddf_dev_get_name(hub_dev->usb_device->ddf_dev), hub_dev->port_count);
 
         usb_pipe_end_long_transfer(&usb_dev->ctrl_pipe);