Changeset 3842a955 in mainline for uspace/drv/ohci/hc.c

Timestamp:

2011-06-19T15:59:42Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

26e7d6d

Parents:

9724d7f (diff), 74464e8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

uspace/drv/ohci/hc.c

@@ -357 +357 @@
                     instance->registers->periodic_current);
 
-                link_t *current = instance->pending_batches.next;
-                while (current != &instance->pending_batches) {
+                link_t *current = instance->pending_batches.head.next;
+                while (current != &instance->pending_batches.head) {
                         link_t *next = current->next;
                         usb_transfer_batch_t *batch =
@@ -367 +367 @@
                                 usb_transfer_batch_finish(batch);
                         }
+
                         current = next;
                 }