Changeset fb422312 in mainline

Timestamp:

2011-10-13T11:42:31Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

eda7a4e0

Parents:

612af1a0

Message:

libusbdev: Warn about not closing hc connections.

There is not much we can do.

Location:

uspace/lib/usbdev/src

Files:

• devdrv.c (modified) (3 diffs)
• hub.c (modified) (5 diffs)

uspace/lib/usbdev/src/devdrv.c

@@ -391 +391 @@
         }
 
-        usb_hc_connection_close(&hc_conn);
+        if (usb_hc_connection_close(&hc_conn) != EOK)
+                usb_log_warning("usb_device_create_pipes(): "
+                    "Failed to close connection.\n");
 
         *pipes_ptr = pipes;
@@ -413 +415 @@
         }
 
-        usb_hc_connection_close(&hc_conn);
+        if (usb_hc_connection_close(&hc_conn) != EOK)
+                usb_log_warning("usb_device_create_pipes(): "
+                    "Failed to close connection.\n");
 
         /*
@@ -468 +472 @@
         }
 
-        usb_hc_connection_close(&hc_conn);
+        if (usb_hc_connection_close(&hc_conn) != EOK)
+                usb_log_warning("usb_device_destroy_pipes(): "
+                    "Failed to close connection.\n");
 
         free(pipes);

uspace/lib/usbdev/src/hub.c

@@ -37 +37 @@
 #include <usb/dev/request.h>
 #include <usb/dev/recognise.h>
+#include <usb/debug.h>
 #include <usbhc_iface.h>
 #include <errno.h>
@@ -220 +221 @@
         usb_address_t dev_addr = usb_hc_request_address(&hc_conn, dev_speed);
         if (dev_addr < 0) {
-                usb_hc_connection_close(&hc_conn);
-                return EADDRNOTAVAIL;
+                rc = EADDRNOTAVAIL;
+                goto close_connection;
         }
 
@@ -336 +337 @@
                 goto leave_release_free_address;
         }
-        
-        usb_hc_connection_close(&hc_conn);
+
 
         /*
@@ -349 +349 @@
         }
 
-        return EOK;
-
-
+        rc = EOK;
+        goto close_connection;
 
         /*
@@ -363 +362 @@
         usb_hc_unregister_device(&hc_conn, dev_addr);
 
-        usb_hc_connection_close(&hc_conn);
+close_connection:
+        if (usb_hc_connection_close(&hc_conn) != EOK)
+                usb_log_warning("usb_hc_new_device_wrapper(): Failed to close "
+                    "connection.\n");
 
         return rc;