Changeset 15d0046 in mainline for uspace/drv/bus/usb/uhcirh/port.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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 mainline changes

File:

• uspace/drv/bus/usb/uhcirh/port.c (modified) (1 diff)

uspace/drv/bus/usb/uhcirh/port.c

@@ -269 +269 @@
         int ret, count = MAX_ERROR_COUNT;
         do {
-                ret = usb_hc_new_device_wrapper(port->rh, &port->hc_connection,
+                port->attached_device.fun = ddf_fun_create(port->rh, fun_inner,
+                    NULL);
+                if (port->attached_device.fun == NULL) {
+                        ret = ENOMEM;
+                        continue;
+                }
+
+                ret = usb_hc_new_device_wrapper(port->rh,
+                    port->attached_device.fun,
+                    &port->hc_connection,
                     speed, uhci_port_reset_enable, port,
-                    &port->attached_device.address, NULL, NULL,
-                    &port->attached_device.fun);
+                    &port->attached_device.address, NULL);
+
+                if (ret != EOK) {
+                        ddf_fun_destroy(port->attached_device.fun);
+                        port->attached_device.fun = NULL;
+                }
+
         } while (ret != EOK && count-- > 0);