Changeset 70fb822 in mainline for uspace/lib/usbhost/src/iface.c

Timestamp:

2011-08-31T18:21:48Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f18d82f0

Parents:

ff6dd73

Message:

libusbhost: change usb_transfer_batch_T handling to get/dispose pair

libusbhost: release endpoint on batch dispose, to be consistent with acquire on get (and avoid deadlock on error path)
uhci: usb_transfer_batch_finish is no longer necessary

File:

• uspace/lib/usbhost/src/iface.c (modified) (1 diff)

uspace/lib/usbhost/src/iface.c

@@ -71 +71 @@
                 return ENOSPC;
         }
-        usb_transfer_batch_t *batch = malloc(sizeof(usb_transfer_batch_t));
+        if (!hcd->schedule) {
+                usb_log_error("HCD does not implement scheduler.\n");
+                return ENOTSUP;
+        }
+
+        /* No private data and no private data dtor */
+        usb_transfer_batch_t *batch =
+            usb_transfer_batch_get(ep, data, NULL, size, setup_data,
+                setup_size, in, out, arg, fun, NULL, NULL);
         if (!batch) {
-                ret = ENOMEM;
-                goto out;
-
-        }
-
-        /* No private data and no private data dtor, these will be set later */
-        usb_transfer_batch_init(batch, ep, data, NULL, size, setup_data,
-            setup_size, in, out, arg, fun, NULL, NULL);
-
-        if (hcd->schedule) {
-                ret = hcd->schedule(hcd, batch);
-        } else {
-                usb_log_error("HCD does not implement scheduler.\n");
-                ret = ENOTSUP;
-        }
-out:
+                return ENOMEM;
+        }
+
+        ret = hcd->schedule(hcd, batch);
         if (ret != EOK)
                 usb_transfer_batch_dispose(batch);