Changeset 45a9cf4 in mainline

Timestamp:

2011-09-17T21:53:30Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

086290d, c5808b41, f1d6866

Parents:

dfa48b0d

Message:

uhci,ohci: Fix memory leak.

Location:

uspace/drv/bus/usb

Files:

• ohci/pci.c (modified) (2 diffs)
• uhci/pci.c (modified) (3 diffs)

uspace/drv/bus/usb/ohci/pci.c

@@ -70 +70 @@
         if (!parent_sess)
                 return ENOMEM;
-        
+
         hw_resource_list_t hw_resources;
         int rc = hw_res_get_resource_list(parent_sess, &hw_resources);
+        async_hangup(parent_sess);
         if (rc != EOK) {
-                async_hangup(parent_sess);
                 return rc;
         }
-        
+
         uintptr_t mem_address = 0;
         size_t mem_size = 0;
         bool mem_found = false;
-        
+
         int irq = 0;
         bool irq_found = false;
-        
+
         size_t i;
         for (i = 0; i < hw_resources.count; i++) {
@@ -107 +107 @@
                 }
         }
-        
+        free(hw_resources.resources);
+
         if (mem_found && irq_found) {
                 *mem_reg_address = mem_address;
                 *mem_reg_size = mem_size;
                 *irq_no = irq;
-                rc = EOK;
-        } else
-                rc = ENOENT;
-        
-        async_hangup(parent_sess);
-        return rc;
+                return EOK;
+        }
+        return ENOENT;
 }
 

uspace/drv/bus/usb/uhci/pci.c

@@ -69 +69 @@
 
         hw_resource_list_t hw_resources;
-        int rc = hw_res_get_resource_list(parent_sess, &hw_resources);
+        const int rc = hw_res_get_resource_list(parent_sess, &hw_resources);
+        async_hangup(parent_sess);
         if (rc != EOK) {
-                async_hangup(parent_sess);
                 return rc;
         }
@@ -78 +78 @@
         size_t io_size = 0;
         bool io_found = false;
-        
+
         int irq = 0;
         bool irq_found = false;
-        
+
         size_t i;
         for (i = 0; i < hw_resources.count; i++) {
@@ -102 +102 @@
                 }
         }
-
-        async_hangup(parent_sess);
+        free(hw_resources.resources);
 
         if (!io_found || !irq_found)