Changeset a39cfb8 in mainline for uspace/drv/uhci-hcd/root_hub.c

Timestamp:

2011-04-14T07:54:33Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

e05d6c3

Parents:

3f3afb9 (diff), 34e8bab (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 from development

File:

• uspace/drv/uhci-hcd/root_hub.c (modified) (2 diffs)

uspace/drv/uhci-hcd/root_hub.c

@@ -55 +55 @@
         int ret = asprintf(&match_str, "usb&uhci&root-hub");
         if (ret < 0) {
-                usb_log_error("Failed to create root hub match string.\n");
-                return ENOMEM;
+                usb_log_error(
+                    "Failed(%d) to create root hub match string: %s.\n",
+                    ret, str_error(ret));
+                return ret;
         }
 
         ret = ddf_fun_add_match_id(fun, match_str, 100);
         if (ret != EOK) {
+                free(match_str);
                 usb_log_error("Failed(%d) to add root hub match id: %s\n",
                     ret, str_error(ret));
@@ -66 +69 @@
         }
 
-        hw_resource_list_t *resource_list = &instance->resource_list;
-        resource_list->count = 1;
-        resource_list->resources = &instance->io_regs;
-        assert(resource_list->resources);
+        /* Initialize resource structure */
+        instance->resource_list.count = 1;
+        instance->resource_list.resources = &instance->io_regs;
+
         instance->io_regs.type = IO_RANGE;
         instance->io_regs.res.io_range.address = reg_addr;