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

Timestamp:

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

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, 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/usbhid/main.c (modified) (3 diffs)

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

@@ -103 +103 @@
         if (rc != EOK) {
                 usb_log_error("Failed to start polling fibril for `%s'.\n",
-                    dev->ddf_dev->name);
+                    ddf_dev_get_name(dev->ddf_dev));
                 usb_hid_deinit(hid_dev);
                 return rc;
@@ -109 +109 @@
         hid_dev->running = true;
 
-        usb_log_info("HID device `%s' ready to use.\n", dev->ddf_dev->name);
+        usb_log_info("HID device `%s' ready to use.\n",
+            ddf_dev_get_name(dev->ddf_dev));
 
         return EOK;
@@ -149 +150 @@
 
         usb_hid_deinit(hid_dev);
-        usb_log_debug2("%s destruction complete.\n", dev->ddf_dev->name);
+        usb_log_debug2("%s destruction complete.\n", ddf_dev_get_name(dev->ddf_dev));
         return EOK;
 }