Changeset ea69749f in mainline

Timestamp:

2013-09-21T03:50:00Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

bf6b7c6

Parents:

8d40181

Message:

uhci: Rework error handling.

File:

• uspace/drv/bus/usb/uhci/uhci.c (modified) (6 diffs)

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

@@ -105 +105 @@
         if (!hc) {
                 usb_log_error("Failed to allocate UHCI HC structure.\n");
-                hcd_ddf_clean_hc(device);
-                return ENOMEM;
+                ret = ENOMEM;
+                goto ddf_hc_clean;
         }
 
@@ -113 +113 @@
                 usb_log_error("Failed to register interrupt handler: %s.\n",
                     str_error(ret));
-                hcd_ddf_clean_hc(device);
-                return ret;
+                goto hc_free;
         }
 
@@ -122 +121 @@
                 usb_log_warning("Failed to enable interrupts: %s."
                     " Falling back to polling.\n", str_error(ret));
+                unregister_interrupt_handler(device, irq);
         } else {
                 usb_log_debug("Hw interrupts enabled.\n");
@@ -131 +131 @@
                 usb_log_error("Failed to disable legacy USB: %s.\n",
                     str_error(ret));
-                hcd_ddf_clean_hc(device);
-                return ret;
+                goto irq_unregister;
         }
 
@@ -138 +137 @@
         if (ret != EOK) {
                 usb_log_error("Failed to init uhci_hcd: %s.\n", str_error(ret));
-                hcd_ddf_clean_hc(device);
-                // TODO unregister interrupt handler
-                return ret;
+                goto irq_unregister;
+                // TODO This is unfortunate, we have neither legacy nor real USB
         }
 
@@ -151 +149 @@
         ret = hcd_ddf_setup_root_hub(device);
         if (ret != EOK) {
-                hc_fini(hc);
-                hcd_ddf_clean_hc(device);
-                // TODO unregister interrupt handler
                 usb_log_error("Failed to setup UHCI root hub: %s.\n",
                     str_error(ret));
-                return ret;
+                hc_fini(hc);
+irq_unregister:
+                unregister_interrupt_handler(device, irq);
+hc_free:
+                free(hc);
+ddf_hc_clean:
+                hcd_ddf_clean_hc(device);
         }
-
-        return EOK;
+        return ret;
 }
 /**