Changeset 5ec492b in mainline for uspace/drv/bus/usb/ohci/ohci.c

Timestamp:

2011-09-07T14:09:07Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ffe3fe1

Parents:

d394f1b8

Message:

ohci: Fix error paths

File:

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

uspace/drv/bus/usb/ohci/ohci.c

@@ -231 +231 @@
 #define CHECK_RET_FINI_RETURN(ret, message...) \
 if (ret != EOK) { \
+        hc_fini(&instance->hc); \
         unregister_interrupt_handler(device, irq); \
-        hc_fini(&instance->hc); \
         CHECK_RET_DEST_FREE_RETURN(ret, message); \
 } else (void)0
@@ -245 +245 @@
             "Failed to add OHCI to HC class: %s.\n", str_error(ret));
 
-        hc_register_hub(&instance->hc, instance->rh_fun);
-        return EOK;
+        ret = hc_register_hub(&instance->hc, instance->rh_fun);
+        CHECK_RET_FINI_RETURN(ret,
+            "Failed to register OHCI root hub: %s.\n", str_error(ret));
+        return ret;
 
 #undef CHECK_RET_FINI_RETURN