Changeset 07a7a97d in mainline for uspace/lib/usbdev/src/hub.c

Timestamp:

2011-10-31T18:03:19Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

46f2808

Parents:

27736cf

Message:

libusbdev: Fix possible pipe leak in new_device_wrapper.

File:

• uspace/lib/usbdev/src/hub.c (modified) (2 diffs)

uspace/lib/usbdev/src/hub.c

@@ -379 +379 @@
          */
 leave_release_default_address:
-        if (usb_pipe_unregister(&ctrl_pipe, &hc_conn) != EOK)
-                usb_log_warning("%s: Failed to unregister default pipe.\n",
-                    __FUNCTION__);
         usb_hc_unregister_device(&hc_conn, USB_ADDRESS_DEFAULT);
 
@@ -388 +385 @@
                 usb_log_warning("%s: Failed to unregister device.\n",
                     __FUNCTION__);
+        /* This might be either 0:0 or dev_addr:0 */
+        if (usb_pipe_unregister(&ctrl_pipe, &hc_conn) != EOK)
+                usb_log_warning("%s: Failed to unregister default pipe.\n",
+                    __FUNCTION__);
 
 close_connection: