Changeset 53a9d02 in mainline for uspace/lib/usbhost/src/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/bus.c (modified) (3 diffs)

uspace/lib/usbhost/src/bus.c

@@ -109 +109 @@
                 return ENOTSUP;
 
-        if (dev->online) {
-                fibril_mutex_unlock(&dev->guard);
+        if (dev->online)
                 return EINVAL;
-        }
 
         const int r = ops->device_enumerate(dev);
-        if (!r) {
-                dev->online = true;
-
+        if (r)
+                return r;
+
+        dev->online = true;
+
+        if (dev->hub) {
                 fibril_mutex_lock(&dev->hub->guard);
                 list_append(&dev->link, &dev->hub->devices);
@@ -123 +124 @@
         }
 
-        return r;
+        return EOK;
 }
 
@@ -192 +193 @@
 
         /* Remove our device from our hub's children. */
-        fibril_mutex_lock(&dev->hub->guard);
-        list_remove(&dev->link);
-        fibril_mutex_unlock(&dev->hub->guard);
+        if (dev->hub) {
+                fibril_mutex_lock(&dev->hub->guard);
+                list_remove(&dev->link);
+                fibril_mutex_unlock(&dev->hub->guard);
+        }
 
         /*