Changeset f1d6866 in mainline for uspace/drv/bus/usb/ohci/pci.c

Timestamp:

2011-09-18T21:22:59Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

dcc44ca1

Parents:

85ff862 (diff), 45a9cf4 (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/ohci/pci.c (modified) (2 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;
 }