Changeset 159100a in mainline for uspace/lib/usbhost/include/usb/host/usb_endpoint_manager.h

Timestamp:

2011-07-13T22:19:26Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ef9460b

Parents:

3e5c48c9 (diff), 5d36062 (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 OHCI improvements and fixes.

File:

• uspace/lib/usbhost/include/usb/host/usb_endpoint_manager.h (modified) (1 diff)

uspace/lib/usbhost/include/usb/host/usb_endpoint_manager.h

@@ -82 +82 @@
     size_t data_size)
 {
-        endpoint_t *ep = malloc(sizeof(endpoint_t));
-        if (ep == NULL)
+        endpoint_t *ep = endpoint_get(
+            address, endpoint, direction, type, speed, max_packet_size);
+        if (!ep)
                 return ENOMEM;
 
-        int ret = endpoint_init(ep, address, endpoint, direction, type, speed,
-            max_packet_size);
-        if (ret != EOK) {
-                free(ep);
-                return ret;
-        }
-
-        ret = usb_endpoint_manager_register_ep(instance, ep, data_size);
+        const int ret =
+            usb_endpoint_manager_register_ep(instance, ep, data_size);
         if (ret != EOK) {
                 endpoint_destroy(ep);
-                return ret;
         }
-        return EOK;
+        return ret;
 }
 #endif