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

Timestamp:

2011-10-30T19:50:54Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3ce78580, 48902fa

Parents:

4c3ad56 (diff), 45bf63c (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/usbhub/port.c (modified) (1 diff)

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

@@ -288 +288 @@
         port->attached_device.fun = NULL;
 
-        ret = usb_hc_unregister_device(&hub->connection,
-            port->attached_device.address);
-        if (ret != EOK) {
-                usb_log_warning("Failed to unregister address of the removed "
-                    "device: %s.\n", str_error(ret));
-        }
+        ret = usb_hc_connection_open(&hub->connection);
+        if (ret == EOK) {
+                ret = usb_hc_unregister_device(&hub->connection,
+                    port->attached_device.address);
+                if (ret != EOK) {
+                        usb_log_warning("Failed to unregister address of the "
+                            "removed device: %s.\n", str_error(ret));
+                }
+                ret = usb_hc_connection_close(&hub->connection);
+                if (ret != EOK) {
+                        usb_log_warning("Failed to close hc connection %s.\n",
+                            str_error(ret));
+                }
+
+        } else {
+                usb_log_warning("Failed to open hc connection %s.\n",
+                    str_error(ret));
+        }
+
         port->attached_device.address = -1;
         fibril_mutex_unlock(&port->mutex);