Changeset 1bab1c8 in mainline

Timestamp:

2018-01-29T15:07:45Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

ddbd088

Parents:

f3ae58b

Message:

libusbhost: bus_remove_endpoint no longer consumes a reference

File:

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

uspace/lib/usbhost/src/bus.c

@@ -173 +173 @@
                 endpoint_t * const ep = dev->endpoints[i];
                 endpoint_add_ref(ep);
-                
+
                 fibril_mutex_unlock(&dev->guard);
-                bus_endpoint_remove(ep);
+                const int err = bus_endpoint_remove(ep);
+                if (err)
+                        usb_log_warning("Endpoint %u cannot be removed. "
+                            "Some deffered cleanup was faster?", ep->endpoint);
+
+                endpoint_del_ref(ep);
                 fibril_mutex_lock(&dev->guard);
-
+        }
+
+        for (usb_endpoint_t i = 1; i < USB_ENDPOINT_MAX; ++i)
                 assert(dev->endpoints[i] == NULL);
-        }
 
         /* Remove also orphaned children. */
@@ -185 +191 @@
                 device_t * const child = list_get_instance(list_first(&dev->devices), device_t, link);
 
-                usb_log_warning("USB device '%s' driver left device '%s' behind after %s.",
+                /*
+                 * This is not an error condition, as devices cannot remove
+                 * their children devices while they are removed, because for
+                 * DDF, they are siblings.
+                 */
+                usb_log_debug("USB device '%s' driver left device '%s' behind after %s.",
                     ddf_fun_get_name(dev->fun), ddf_fun_get_name(child->fun), op);
+
                 /*
                  * The child node won't disappear, because its parent's driver
@@ -463 +475 @@
 
 /**
- * Remove an endpoint from the device. Consumes a reference.
+ * Remove an endpoint from the device.
  */
 int bus_endpoint_remove(endpoint_t *ep)
@@ -491 +503 @@
 
         fibril_mutex_lock(&device->guard);
+
+        /* Check whether the endpoint is registered */
+        if (device->endpoints[idx] != ep) {
+                fibril_mutex_unlock(&device->guard);
+                return EINVAL;
+        }
+
         bus->ops->endpoint_unregister(ep);
         device->endpoints[idx] = NULL;
@@ -496 +515 @@
 
         /* Bus reference */
-        endpoint_del_ref(ep);
-
-        /* Given reference */
         endpoint_del_ref(ep);