Changeset 159100a in mainline for uspace/drv/bus/usb/uhci/root_hub.c

Timestamp:

2011-07-13T22:19:26Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ef9460b

Parents:

3e5c48c9 (diff), 5d36062 (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 OHCI improvements and fixes.

File:

• uspace/drv/bus/usb/uhci/root_hub.c (modified) (2 diffs)

uspace/drv/bus/usb/uhci/root_hub.c

@@ -55 +55 @@
         int ret = asprintf(&match_str, "usb&uhci&root-hub");
         if (ret < 0) {
-                usb_log_error(
-                    "Failed(%d) to create root hub match string: %s.\n",
-                    ret, str_error(ret));
+                usb_log_error("Failed to create root hub match string: %s.\n",
+                    str_error(ret));
                 return ret;
         }
@@ -65 +64 @@
         if (ret != EOK) {
                 free(match_str);
-                usb_log_error("Failed(%d) to add root hub match id: %s\n",
-                    ret, str_error(ret));
+                usb_log_error("Failed to add root hub match id: %s\n",
+                    str_error(ret));
                 return ret;
         }