Changeset 9ff99e8 in mainline

Timestamp:

2018-01-15T20:12:32Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

957ea3a

Parents:

a1732929

Message:

xhci: unlock mutex on error

File:

• uspace/drv/bus/usb/xhci/trb_ring.c (modified) (4 diffs)

uspace/drv/bus/usb/xhci/trb_ring.c

@@ -194 +194 @@
         size_t trbs, uintptr_t *phys)
 {
+        int err;
         assert(trbs > 0);
         fibril_mutex_lock(&ring->guard);
@@ -209 +210 @@
         for (size_t i = 0; i < trbs; ++i, ++trb) {
                 if (phys && trb_generates_interrupt(trb)) {
-                        if (*phys)
-                                return ENOTSUP;
+                        if (*phys) {
+                                err = ENOTSUP;
+                                goto err;
+                        }
                         *phys = trb_ring_enqueue_phys(ring);
                 }
@@ -219 +222 @@
                         trb_ring_resolve_link(ring);
 
-                if (trb_ring_enqueue_phys(ring) == ring->dequeue)
-                        goto err_again;
+                if (trb_ring_enqueue_phys(ring) == ring->dequeue) {
+                        err = EAGAIN;
+                        goto err;
+                }
         }
 
@@ -252 +257 @@
         return EOK;
 
-err_again:
+err:
         ring->enqueue_segment = saved_enqueue_segment;
         ring->enqueue_trb = saved_enqueue_trb;
         fibril_mutex_unlock(&ring->guard);
-        return EAGAIN;
+        return err;
 }