Changeset 7eaeec1 in mainline for uspace/drv/bus/usb/usbflbk/main.c

Timestamp:

2012-08-20T21:27:38Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

6a97f2e

Parents:

f3a37e28 (diff), dd13349 (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/usbflbk/main.c (modified) (2 diffs)

uspace/drv/bus/usb/usbflbk/main.c

@@ -69 +69 @@
             " (node `%s', handle %" PRIun ").\n",
             dev->interface_no < 0 ? "device" : "interface",
-            dev->ddf_dev->name, fun_name, dev->ddf_dev->handle);
+            ddf_dev_get_name(dev->ddf_dev), fun_name, ddf_dev_get_handle(dev->ddf_dev));
 
         return EOK;
@@ -85 +85 @@
         const int ret = ddf_fun_unbind(ctl_fun);
         if (ret != EOK) {
-                usb_log_error("Failed to unbind %s.\n", ctl_fun->name);
+                usb_log_error("Failed to unbind %s.\n", ddf_fun_get_name(ctl_fun));
                 return ret;
         }