Changeset 925a21e in mainline for uspace/drv/bus/usb/uhci/root_hub.c

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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) (2 diffs)

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(instance);
         assert(fun);
-
-        ret = ddf_fun_add_match_id(fun, "usb&uhci&root-hub", 100);
-        if (ret != EOK) {
-                usb_log_error("Failed to add root hub match id: %s\n",
-                    str_error(ret));
-                return ret;
-        }
 
         /* Initialize resource structure */
@@ -70 +62 @@
         instance->io_regs.res.io_range.endianness = LITTLE_ENDIAN;
 
-        return EOK;
+        const int ret = ddf_fun_add_match_id(fun, "usb&uhci&root-hub", 100);
+        if (ret != EOK) {
+                usb_log_error("Failed to add root hub match id: %s\n",
+                    str_error(ret));
+        }
+        return ret;
 }
 /**