Changeset 9748336 in mainline

Timestamp:

2018-01-10T20:08:54Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

a70f349

Parents:

94a0904

Message:

usbhost: be more careful with detached endpoints

Location:

uspace/lib/usbhost

Files:

• include/usb/host/endpoint.h (modified) (1 diff)
• src/endpoint.c (modified) (3 diffs)

uspace/lib/usbhost/include/usb/host/endpoint.h

@@ -116 +116 @@
 static inline bus_t *endpoint_get_bus(endpoint_t *ep)
 {
-        return ep->device->bus;
+        device_t * const device = ep->device;
+        return device ? device->bus : NULL;
 }
 

uspace/lib/usbhost/src/endpoint.c

@@ -248 +248 @@
             name, target.address, target.endpoint, size, ep->max_packet_size);
 
-        bus_t *bus = endpoint_get_bus(ep);
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(bus->ops, batch_schedule);
+        device_t * const device = ep->device;
+        if (!device) {
+                usb_log_warning("Endpoint detached");
+                return EAGAIN;
+        }
+
+        const bus_ops_t *ops = BUS_OPS_LOOKUP(device->bus->ops, batch_schedule);
         if (!ops) {
                 usb_log_error("HCD does not implement scheduler.\n");
@@ -256 +261 @@
 
         /* Offline devices don't schedule transfers other than on EP0. */
-        if (!ep->device->online && ep->endpoint > 0) {
+        if (!device->online && ep->endpoint > 0) {
                 return EAGAIN;
         }
@@ -265 +270 @@
                 usb_log_error("Endpoint(%d:%d) %s needs %zu bw "
                     "but only %zu is reserved.\n",
-                    ep->device->address, ep->endpoint, name, bw, ep->bandwidth);
+                    device->address, ep->endpoint, name, bw, ep->bandwidth);
                 return ENOSPC;
         }