Changeset d802671d in mainline

Timestamp:

2012-07-01T20:27:01Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

96606fe

Parents:

02020dc (diff), 0bbd13e (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 with mainline

File:

• uspace/drv/bus/isa/isa.c (modified) (2 diffs)

uspace/drv/bus/isa/isa.c

@@ -201 +201 @@
 
         isa_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(isa_fun_t));
-        if (fun == NULL)
+        if (fun == NULL) {
+                ddf_fun_destroy(fnode);
                 return NULL;
+        }
 
         fibril_mutex_initialize(&fun->mutex);
@@ -552 +554 @@
 
         isa_fun_t *fun = isa_fun_create(isa, fun_name);
+        free(fun_name);
         if (fun == NULL) {
-                free(fun_name);
                 return NULL;
         }