Changeset 41ef5b9 in mainline for uspace/drv/uhci-hcd/uhci.c

Timestamp:

2011-03-21T17:16:10Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

4d0c40b

Parents:

fd9f6e4c (diff), 434ef65 (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 from usb/development

File:

• uspace/drv/uhci-hcd/uhci.c (modified) (1 diff)

uspace/drv/uhci-hcd/uhci.c

@@ -70 +70 @@
 {
         assert(fun);
-        device_keeper_t *manager = &((uhci_t*)fun->dev->driver_data)->hc.device_manager;
-
-        usb_address_t addr = device_keeper_find(manager, handle);
+        usb_device_keeper_t *manager = &((uhci_t*)fun->dev->driver_data)->hc.device_manager;
+
+        usb_address_t addr = usb_device_keeper_find(manager, handle);
         if (addr < 0) {
                 return addr;