Changeset 22ceff3a in mainline for uspace/drv/bus/usb/ohci/ohci_endpoint.c

Timestamp:

2011-10-17T07:29:44Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

12f55220

Parents:

25696fea (diff), 1f131fb9 (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/ohci_endpoint.c (modified) (1 diff)

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

@@ -102 +102 @@
         }
 
-        ed_init(ohci_ep->ed, ep);
-        ed_set_td(ohci_ep->ed, ohci_ep->td);
+        ed_init(ohci_ep->ed, ep, ohci_ep->td);
         endpoint_set_hc_data(
             ep, ohci_ep, ohci_endpoint_fini, ohci_ep_toggle_get, ohci_ep_toggle_set);