Changeset c2245a3 in mainline for uspace/drv/bus/usb/usbhub/port.c

Timestamp:

2011-11-10T20:03:48Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

fa76f81

Parents:

27ca3a3 (diff), 747ef72 (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/usbhub/port.c (modified) (2 diffs)

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

@@ -401 +401 @@
 {
         usb_hub_port_t *port = arg;
+        assert(port);
         const int rc =
             usb_hub_port_set_feature(port, USB_HUB_FEATURE_PORT_RESET);
@@ -440 +441 @@
             data->port, &new_address, NULL, NULL, &child_fun);
 
-        if (rc != EOK) {
+        if (rc == EOK) {
+                fibril_mutex_lock(&data->port->mutex);
+                data->port->attached_device.fun = child_fun;
+                data->port->attached_device.address = new_address;
+                fibril_mutex_unlock(&data->port->mutex);
+
+                usb_log_info("Detected new device on `%s' (port %zu), "
+                    "address %d (handle %" PRIun ").\n",
+                    data->hub->usb_device->ddf_dev->name,
+                    data->port->port_number, new_address, child_fun->handle);
+        } else {
                 usb_log_error("Failed registering device on port %zu: %s.\n",
                     data->port->port_number, str_error(rc));
-                goto leave;
-        }
-
-        fibril_mutex_lock(&data->port->mutex);
-        data->port->attached_device.fun = child_fun;
-        data->port->attached_device.address = new_address;
-        fibril_mutex_unlock(&data->port->mutex);
-
-        usb_log_info("Detected new device on `%s' (port %zu), "
-            "address %d (handle %" PRIun ").\n",
-            data->hub->usb_device->ddf_dev->name, data->port->port_number,
-            new_address, child_fun->handle);
-
-leave:
+        }
+
+
         fibril_mutex_lock(&data->hub->pending_ops_mutex);
         assert(data->hub->pending_ops_count > 0);