Changeset 53a9d02 in mainline for uspace/lib/usbhost/src/usb2_bus.c

Timestamp:

2018-01-11T09:17:43Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

30fc56f

Parents:

17783bf

Message:

usb: fix errors introduced by recent changes

File:

• uspace/lib/usbhost/src/usb2_bus.c (modified) (4 diffs)

uspace/lib/usbhost/src/usb2_bus.c

@@ -106 +106 @@
  *
  * Reserve address, configure the control EP, issue a SET_ADDRESS command.
- * Configure the device with the new address, mark the device as online.
+ * Configure the device with the new address,
  */
 static int address_device(device_t *dev)
@@ -160 +160 @@
                 goto err_address;
         }
-        endpoint_del_ref(default_ep);
 
         dev->address = address;
@@ -173 +172 @@
         }
 
-        /* From now on, the device is officially online, yay! */
-        fibril_mutex_lock(&dev->guard);
-        dev->online = true;
-        fibril_mutex_unlock(&dev->guard);
-
         return EOK;
 
 err_default_control_ep:
         bus_endpoint_remove(default_ep);
-        endpoint_del_ref(default_ep);
 err_address:
         release_address(bus, address);
@@ -235 +228 @@
 {
         usb2_bus_t *bus = bus_to_usb2_bus(ep->device->bus);
-        assert(fibril_mutex_is_locked(&bus->base.guard));
+        assert(fibril_mutex_is_locked(&ep->device->guard));
         assert(ep);