Changeset 7943c43 in mainline for uspace/drv/bus/usb/uhci/transfer_list.c

Timestamp:

2012-01-16T22:45:38Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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/bus/usb/uhci/transfer_list.c (modified) (1 diff)

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

@@ -184 +184 @@
                     uhci_transfer_batch_from_link(current);
                 transfer_list_remove_batch(instance, batch);
-                batch->usb_batch->error = EINTR;
-                uhci_transfer_batch_call_dispose(batch);
+                uhci_transfer_batch_abort(batch);
         }
         fibril_mutex_unlock(&instance->guard);