Changeset 45bf63c in mainline for uspace/lib/usbdev/src/altiface.c

Timestamp:

2011-10-30T15:35:36Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

20a3465, 3ce78580

Parents:

1737bfb (diff), e978ada (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 from USB branch.

Cleanup libusbhost interfaces.
Fix few possible memory corruption/crashes and memory leaks.
Add device_remove hooks for usbflbk, usbhid.

File:

• uspace/lib/usbdev/src/altiface.c (modified) (4 diffs)

uspace/lib/usbdev/src/altiface.c

@@ -98 +98 @@
         assert(config_descr_size > 0);
 
+        *alternates_ptr = NULL;
         if (interface_number < 0) {
-                alternates_ptr = NULL;
                 return EOK;
         }
@@ -105 +105 @@
         usb_alternate_interfaces_t *alternates
             = malloc(sizeof(usb_alternate_interfaces_t));
-
         if (alternates == NULL) {
                 return ENOMEM;
@@ -119 +118 @@
         }
 
-        alternates->alternatives = malloc(alternates->alternative_count
-            * sizeof(usb_alternate_interface_descriptors_t));
+        alternates->alternatives = calloc(alternates->alternative_count,
+            sizeof(usb_alternate_interface_descriptors_t));
         if (alternates->alternatives == NULL) {
                 free(alternates);
@@ -176 +175 @@
 }
 
-
+void usb_alternate_interfaces_destroy(usb_alternate_interfaces_t *alternate)
+{
+        if (!alternate)
+                return;
+        free(alternate->alternatives);
+        free(alternate);
+}
 /**
  * @}