Changeset 18ae0c8 in mainline for uspace/drv/bus/isa/isa.c

Timestamp:

2012-08-17T18:00:28Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0d7eb0f

Parents:

b5f305b

Message:

isa: Get rid of double NULL check.

Both fun_conf_parse and free are NULL safe.

File:

• uspace/drv/bus/isa/isa.c (modified) (1 diff)

uspace/drv/bus/isa/isa.c

@@ -573 +573 @@
 static void isa_functions_add(isa_bus_t *isa)
 {
-        char *fun_conf;
-
-        fun_conf = fun_conf_read(CHILD_FUN_CONF_PATH);
-        if (fun_conf != NULL) {
-                fun_conf_parse(fun_conf, isa);
-                free(fun_conf);
-        }
+        char *fun_conf = fun_conf_read(CHILD_FUN_CONF_PATH);
+        fun_conf_parse(fun_conf, isa);
+        free(fun_conf);
 }