Changeset a6c4597 in mainline

Timestamp:

2018-01-11T04:12:06Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

bad4a05

Parents:

f82c4822

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-10 22:26:56)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-11 04:12:06)

Message:

usbhost: survive unregistering detached endpoint

File:

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

uspace/lib/usbhost/src/bus.c

@@ -199 +199 @@
             ep->max_transfer_size);
 
-        fibril_mutex_lock(&bus->guard);
+        fibril_mutex_lock(&device->guard);
         if (!device->online && ep->endpoint != 0) {
                 err = EAGAIN;
@@ -209 +209 @@
                         device->endpoints[ep->endpoint] = ep;
         }
-        fibril_mutex_unlock(&bus->guard);
+        fibril_mutex_unlock(&device->guard);
         if (err) {
                 endpoint_del_ref(ep);
@@ -231 +231 @@
         assert(device);
 
-        bus_t *bus = device->bus;
-
-        fibril_mutex_lock(&bus->guard);
+        fibril_mutex_lock(&device->guard);
         endpoint_t *ep = device->endpoints[endpoint];
         if (ep) {
@@ -239 +237 @@
                 endpoint_add_ref(ep);
         }
-        fibril_mutex_unlock(&bus->guard);
+        fibril_mutex_unlock(&device->guard);
         return ep;
 }
@@ -251 +249 @@
         assert(ep->device);
 
-        bus_t *bus = endpoint_get_bus(ep);
+        device_t *device = ep->device;
+        if (!device)
+                return ENOENT;
+
+        bus_t *bus = device->bus;
 
         const bus_ops_t *ops = BUS_OPS_LOOKUP(bus->ops, endpoint_unregister);
@@ -258 +260 @@
 
         usb_log_debug("Unregister endpoint %d:%d %s-%s %zuB.\n",
-            ep->device->address, ep->endpoint,
+            device->address, ep->endpoint,
             usb_str_transfer_type(ep->transfer_type),
             usb_str_direction(ep->direction),
             ep->max_transfer_size);
 
-        fibril_mutex_lock(&bus->guard);
+        fibril_mutex_lock(&device->guard);
         const int r = ops->endpoint_unregister(ep);
         if (!r)
-                ep->device->endpoints[ep->endpoint] = NULL;
-        fibril_mutex_unlock(&bus->guard);
+                device->endpoints[ep->endpoint] = NULL;
+        fibril_mutex_unlock(&device->guard);
 
         if (r)