Changeset a5a470c in mainline for uspace/drv/bus/usb/usbhub/port.c

Timestamp:

2013-01-07T17:37:32Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1c73603

Parents:

c9467b0

Message:

usbhub: Decrease op count on error paths.

File:

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

uspace/drv/bus/usb/usbhub/port.c

@@ -458 +458 @@
         assert(params);
 
+        int ret = EOK;
         usb_hub_dev_t *hub = params->hub;
         usb_hub_port_t *port = params->port;
@@ -468 +469 @@
         if (!exch) {
                 usb_log_error("Failed to begin bus exchange\n");
-                return ENOMEM;
+                ret = ENOMEM;
+                goto out;
         }
 
         /* Reserve default address */
-        int ret;
         while ((ret = usb_reserve_default_address(exch, speed)) == ENOENT) {
                 async_usleep(1000000);
@@ -479 +480 @@
                 usb_log_error("Failed to reserve default address: %s\n",
                     str_error(ret));
-                async_exchange_end(exch);
-                return ret;
+                goto out;
         }
 
@@ -489 +489 @@
                 if (usb_release_default_address(exch) != EOK)
                         usb_log_warning("Failed to release default address\n");
-                async_exchange_end(exch);
-                return EIO;
+                ret = EIO;
+                goto out;
         }
 
@@ -508 +508 @@
                         usb_log_warning("Failed to release default address\n");
         }
+out:
         async_exchange_end(exch);