Changeset 2c091a6 in mainline

Timestamp:

2017-10-22T10:02:38Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

a4e26882

Parents:

2e5aea1

Message:

xhci ep: fixed error path

File:

• uspace/drv/bus/usb/xhci/endpoint.c (modified) (3 diffs)

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

@@ -203 +203 @@
         // Prepare input context.
         xhci_input_ctx_t *ictx = malloc32(sizeof(xhci_input_ctx_t));
-        const unsigned ep_idx = xhci_endpoint_index(ep);
         if (!ictx)
                 goto err;
@@ -214 +213 @@
         XHCI_INPUT_CTRL_CTX_DROP_CLEAR(ictx->ctrl_ctx, 1);
         XHCI_INPUT_CTRL_CTX_ADD_SET(ictx->ctrl_ctx, 0);
+
+        const unsigned ep_idx = xhci_endpoint_index(ep);
         XHCI_INPUT_CTRL_CTX_ADD_SET(ictx->ctrl_ctx, ep_idx + 1); /* Preceded by slot ctx */
 
@@ -255 +256 @@
         free32(ictx);
 err:
-        dev->endpoints[ep_idx] = NULL;
+        dev->endpoints[ep_num] = NULL;
         dev->active_endpoint_count--;
         return err;