Changeset 0539c14 in mainline

Timestamp:

2018-02-24T19:51:28Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

95f1b8f

Parents:

ee820ff

git-author:

Ondřej Hlavatý <aearsis@…> (2018-02-22 22:42:45)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-02-24 19:51:28)

Message:

ohci: batch can be prepared without activating ep first

File:

• uspace/drv/bus/usb/ohci/hc.c (modified) (2 diffs)

uspace/drv/bus/usb/ohci/hc.c

@@ -304 +304 @@
         int err;
 
+        if ((err = ohci_transfer_batch_prepare(ohci_batch)))
+                return err;
+
         fibril_mutex_lock(&hc->guard);
         if ((err = endpoint_activate_locked(ep, batch))) {
@@ -309 +312 @@
                 return err;
         }
-
-        if ((err = ohci_transfer_batch_prepare(ohci_batch)))
-                return err;
 
         ohci_transfer_batch_commit(ohci_batch);