summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2006-06-20 19:49:28 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2006-06-20 19:49:28 +0000
commite5bb3a01d70085170182ad0f16665cc54d60a839 (patch)
treeadfa14b39a2052f1567f4f88cf55ee29247b30fb
parent73a2437a83202bb2d0b4fa167ac10c83d668e2bf (diff)
Notes
-rw-r--r--sys/kern/kern_linker.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index 50e22cdb1fee..1af568807870 100644
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -1764,11 +1764,9 @@ linker_load_module(const char *kldname, const char *modname,
* provide different versions of the same modules.
*/
filename = linker_basename(pathname);
- if (linker_find_file_by_name(filename)) {
+ if (linker_find_file_by_name(filename))
error = EEXIST;
- goto out;
- }
- do {
+ else do {
error = linker_load_file(pathname, &lfdep);
if (error)
break;
@@ -1786,7 +1784,6 @@ linker_load_module(const char *kldname, const char *modname,
if (lfpp)
*lfpp = lfdep;
} while (0);
-out:
free(pathname, M_LINKER);
return (error);
}