Changeset 86ffa27f in mainline for uspace/drv/bus/usb/uhci/root_hub.c

Timestamp:

2011-08-07T11:21:44Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cc574511

Parents:

15f3c3f (diff), e8067c0 (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/uhci/root_hub.c (modified) (1 diff)

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

@@ -50 +50 @@
 int rh_init(rh_t *instance, ddf_fun_t *fun, uintptr_t reg_addr, size_t reg_size)
 {
+        int ret;
+
         assert(fun);
 
-        char *match_str = NULL;
-        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));
-                return ret;
-        }
-        assert(match_str);
-
-        ret = ddf_fun_add_match_id(fun, match_str, 100);
+        ret = ddf_fun_add_match_id(fun, "usb&uhci&root-hub", 100);
         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;
         }