Changeset e199ab3 in mainline for uspace/lib/usbhost/src/bus.c

Timestamp:

2018-11-27T16:51:11Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c483fca

Parents:

9df0f64

git-author:

Jakub Jermar <jakub@…> (2018-11-22 17:36:48)

git-committer:

Jakub Jermar <jakub@…> (2018-11-27 16:51:11)

Message:

Fix endpoint reference counting

After commit 498ced1, an endpoint is created with an implicit reference.
Adding an extra reference for creation thus adds a reference that will
never be dropped and the endpoint will be leaked.

This commit removes the extra reference.

File:

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

uspace/lib/usbhost/src/bus.c

@@ -370 +370 @@
 int bus_endpoint_add(device_t *device, const usb_endpoint_descriptors_t *desc, endpoint_t **out_ep)
 {
-        int err;
+        int err = EINVAL;
         assert(device);
 
@@ -392 +392 @@
         assert((ep->required_transfer_buffer_policy & ~ep->transfer_buffer_policy) == 0);
 
-        /* Bus reference */
-        endpoint_add_ref(ep);
-
         const size_t idx = bus_endpoint_index(ep->endpoint, ep->direction);
         if (idx >= ARRAY_SIZE(device->endpoints)) {
@@ -425 +422 @@
         }
         fibril_mutex_unlock(&device->guard);
-        if (err) {
-                endpoint_del_ref(ep);
-                return err;
-        }
+        if (err)
+                goto drop;
 
         if (out_ep) {
@@ -438 +433 @@
         return EOK;
 drop:
-        /* Bus reference */
         endpoint_del_ref(ep);
-        return EINVAL;
+        return err;
 }