Changeset bf6b7c6 in mainline

Timestamp:

2013-09-21T03:54:03Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

30e8ab4

Parents:

ea69749f

Message:

ohci: rework error handling

File:

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

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

@@ -91 +91 @@
         hw_res_list_parsed_clean(&hw_res);
 
-
         usb_log_debug("Memory mapped regs at %p (size %zu), IRQ %d.\n",
             RNGABSPTR(regs), RNGSZ(regs), irq);
@@ -99 +98 @@
             BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
         if (ret != EOK) {
-                usb_log_error("Failedd to setup generic hcd: %s.",
+                usb_log_error("Failed to setup generic hcd structures: %s.",
                     str_error(ret));
                 return ret;
@@ -108 +107 @@
                 usb_log_error("Failed to register interrupt handler: %s.\n",
                     str_error(ret));
-                hcd_ddf_clean_hc(device);
-                return ret;
+                goto ddf_hc_clean;
         }
 
@@ -125 +123 @@
         }
 
-
-        hc_t *hc_impl = malloc(sizeof(hc_t));
-        if (!hc_impl) {
+        hc_t *hc = malloc(sizeof(hc_t));
+        if (!hc) {
                 usb_log_error("Failed to allocate driver structure.\n");
-                hcd_ddf_clean_hc(device);
-                unregister_interrupt_handler(device, irq);
-                return ENOMEM;
+                ret = ENOMEM;
+                goto unregister_irq;
         }
 
         /* Initialize OHCI HC */
-        ret = hc_init(hc_impl, &regs, interrupts);
+        ret = hc_init(hc, &regs, interrupts);
         if (ret != EOK) {
                 usb_log_error("Failed to init hc: %s.\n", str_error(ret));
-                hcd_ddf_clean_hc(device);
-                unregister_interrupt_handler(device, irq);
-                return ret;
+                goto hc_free;
         }
 
         /* Connect OHCI to generic HCD */
-        hcd_set_implementation(dev_to_hcd(device), hc_impl,
+        hcd_set_implementation(dev_to_hcd(device), hc,
             hc_schedule, ohci_endpoint_init, ohci_endpoint_fini);
 
@@ -150 +144 @@
         ret = hcd_ddf_setup_root_hub(device);
         if (ret != EOK) {
-                usb_log_error("Failed to registter OHCI root hub: %s.\n",
+                usb_log_error("Failed to register OHCI root hub: %s.\n",
                     str_error(ret));
+                hc_fini(hc);
+hc_free:
+                free(hc);
+unregister_irq:
+                unregister_interrupt_handler(device, irq);
+ddf_hc_clean:
                 hcd_ddf_clean_hc(device);
-                unregister_interrupt_handler(device, irq);
-                return ret;
         }
-
         return ret;
 }