Changes in uspace/drv/uhci-hcd/root_hub.c [fa3de85:ea993d18] in mainline

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;