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

Timestamp:

2011-10-31T06:52:54Z (14 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/uhci/uhci.c (modified) (1 diff)

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

@@ -101 +101 @@
         usb_device_manager_t *manager =
             &dev_to_uhci(fun->dev)->hc.generic.dev_manager;
-        const usb_address_t addr = usb_device_manager_find(manager, handle);
+        const usb_address_t addr =
+            usb_device_manager_find_address(manager, handle);
 
         if (addr < 0) {