Changeset c83a55c in mainline for uspace/drv/bus/usb/ohci/root_hub.c

Timestamp:

2011-10-31T06:52:54Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

c25e39b

Parents:

e8ab32f (diff), 3ce78580 (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 with mainline

File:

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

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

@@ -235 +235 @@
                 usb_transfer_batch_finish_error(request, NULL, 0, EINVAL);
         }
-        usb_transfer_batch_dispose(request);
+        usb_transfer_batch_destroy(request);
 }
 /*----------------------------------------------------------------------------*/
@@ -254 +254 @@
                 interrupt_request(instance->unfinished_interrupt_transfer,
                     mask, instance->interrupt_mask_size);
-                usb_transfer_batch_dispose(
+                usb_transfer_batch_destroy(
                     instance->unfinished_interrupt_transfer);
                 instance->unfinished_interrupt_transfer = NULL;