Changeset 351113f in mainline

Timestamp:

2018-01-11T12:41:40Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

929599a8

Parents:

92caadd

Message:

usbhost: fix return in critical section, change misleading log messages

File:

• uspace/lib/usbhost/src/bus.c (modified) (5 diffs)

uspace/lib/usbhost/src/bus.c

@@ -229 +229 @@
 int bus_device_online(device_t *dev)
 {
-        int err;
+        int rc;
         assert(dev);
 
         fibril_mutex_lock(&dev->guard);
         if (dev->online) {
-                fibril_mutex_unlock(&dev->guard);
-                return EINVAL;
+                rc = EINVAL;
+                goto err_lock;
         }
 
         /* First, tell the HC driver. */
         const bus_ops_t *ops = BUS_OPS_LOOKUP(dev->bus->ops, device_online);
-        if (ops && (err = ops->device_online(dev))) {
-                usb_log_warning("Host controller refused to make device '%s' online: %s",
-                    ddf_fun_get_name(dev->fun), str_error(err));
-                return err;
+        if (ops && (rc = ops->device_online(dev))) {
+                usb_log_warning("Host controller failed to make device '%s' online: %s",
+                    ddf_fun_get_name(dev->fun), str_error(rc));
+                goto err_lock;
         }
 
@@ -252 +252 @@
         fibril_mutex_unlock(&dev->guard);
 
-        if ((err = ddf_fun_online(dev->fun))) {
+        if ((rc = ddf_fun_online(dev->fun))) {
                 usb_log_warning("Failed to take device '%s' online: %s",
-                    ddf_fun_get_name(dev->fun), str_error(err));
-                return err;
-        }
-
-        usb_log_info("USB Device '%s' offlined.", ddf_fun_get_name(dev->fun));
-        return EOK;
+                    ddf_fun_get_name(dev->fun), str_error(rc));
+                goto err;
+        }
+
+        usb_log_info("USB Device '%s' is now online.", ddf_fun_get_name(dev->fun));
+        return EOK;
+
+err_lock:
+        fibril_mutex_unlock(&dev->guard);
+err:
+        return rc;
 }
 
@@ -267 +272 @@
 int bus_device_offline(device_t *dev)
 {
-        int err;
+        int rc;
         assert(dev);
 
         /* Make sure we're the one who offlines this device */
-        if (!dev->online)
-                return ENOENT;
+        if (!dev->online) {
+                rc = ENOENT;
+                goto err;
+        }
 
         /*
@@ -281 +288 @@
         
         /* Tear down all drivers working with the device. */
-        if ((err = ddf_fun_offline(dev->fun))) {
-                return err;
+        if ((rc = ddf_fun_offline(dev->fun))) {
+                goto err;
         }
 
@@ -295 +302 @@
 
         fibril_mutex_unlock(&dev->guard);
-        usb_log_info("USB Device '%s' offlined.", ddf_fun_get_name(dev->fun));
-        return EOK;
+        usb_log_info("USB Device '%s' is now offline.", ddf_fun_get_name(dev->fun));
+        return EOK;
+
+err:
+        return rc;
 }