Changeset 2755a622 in mainline for uspace/drv/bus/usb/uhci/uhci_batch.c

Timestamp:

2018-01-17T01:36:46Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

740dafc

Parents:

3f44312

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-16 23:24:28)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-17 01:36:46)

Message:

uhci: fix transfer aborting

File:

• uspace/drv/bus/usb/uhci/uhci_batch.c (modified) (2 diffs)

uspace/drv/bus/usb/uhci/uhci_batch.c

@@ -179 +179 @@
 
                         batch->ep->toggle = td_toggle(&uhci_batch->tds[i]);
-                        if (i > 0)
-                                goto substract_ret;
-                        return true;
+                        goto substract_ret;
                 }
 
@@ -190 +188 @@
         }
 substract_ret:
-        if (batch->ep->transfer_type == USB_TRANSFER_CONTROL)
+        if (batch->transfered_size > 0 && batch->ep->transfer_type == USB_TRANSFER_CONTROL) {
+                assert(batch->transfered_size >= USB_SETUP_PACKET_SIZE);
                 batch->transfered_size -= USB_SETUP_PACKET_SIZE;
-
-        fibril_mutex_lock(&batch->ep->guard);
-        endpoint_deactivate_locked(batch->ep);
-        fibril_mutex_unlock(&batch->ep->guard);
+        }
 
         if (batch->dir == USB_DIRECTION_IN) {