aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2005-08-27 13:47:06 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-27 10:11:40 -0700
commit820d220de400cfaaf846a2d8b5de93f9ea5a9b80 (patch)
tree1ae4d2b24483c41446d42b07f6ca120674c3fae0 /drivers
parent[PATCH] acpi_shutdown: Only prepare for power off on power_off (diff)
downloadlinux-dev-820d220de400cfaaf846a2d8b5de93f9ea5a9b80.tar.xz
linux-dev-820d220de400cfaaf846a2d8b5de93f9ea5a9b80.zip
[PATCH] Fix capifs bug in initialization error path.
This fixes a bug in the capifs initialization code, where the filesystem is not unregistered if kern_mount() fails. Signed-off-by: James Morris <jmorris@namei.org> Signed-off-by: Karsten Keil <kkeil@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/isdn/capi/capifs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c
index f8570fd9d2ab..3abd7fc6e5ef 100644
--- a/drivers/isdn/capi/capifs.c
+++ b/drivers/isdn/capi/capifs.c
@@ -191,8 +191,10 @@ static int __init capifs_init(void)
err = register_filesystem(&capifs_fs_type);
if (!err) {
capifs_mnt = kern_mount(&capifs_fs_type);
- if (IS_ERR(capifs_mnt))
+ if (IS_ERR(capifs_mnt)) {
err = PTR_ERR(capifs_mnt);
+ unregister_filesystem(&capifs_fs_type);
+ }
}
if (!err)
printk(KERN_NOTICE "capifs: Rev %s\n", rev);