Changeset 7943c43 in mainline for uspace/drv/bus/usb/uhcirh/port.c

Timestamp:

2012-01-16T22:45:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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) (2 diffs)

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

@@ -260 +260 @@
 {
         assert(port);
-        assert(usb_hc_connection_is_opened(&port->hc_connection));
 
         usb_log_debug("%s: Detected new device.\n", port->id_string);
@@ -314 +313 @@
 
         /* Driver stopped, free used address */
-        ret = usb_hc_unregister_device(&port->hc_connection,
-            port->attached_device.address);
+        ret = usb_hub_unregister_device(&port->hc_connection,
+            &port->attached_device);
         if (ret != EOK) {
                 usb_log_error("%s: Failed to unregister address of removed "