diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:55:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:55:03 -0400 |
| commit | e993835441734c184d70d3716eed78a08eeb71c2 (patch) | |
| tree | 583aa17813cdae1c4640e353f8c6df3f197e7548 /fs/cramfs/inode.c | |
| parent | 360f654e7cda850034f3f6252a7a7cff3fa77356 (diff) | |
| parent | 1bdfd554be94def718323659173517c5d4a69d25 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/cramfs/inode.c')
| -rw-r--r-- | fs/cramfs/inode.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c index ad96b699071..a624c3ec818 100644 --- a/fs/cramfs/inode.c +++ b/fs/cramfs/inode.c @@ -543,8 +543,15 @@ static struct file_system_type cramfs_fs_type = { static int __init init_cramfs_fs(void) { - cramfs_uncompress_init(); - return register_filesystem(&cramfs_fs_type); + int rv; + + rv = cramfs_uncompress_init(); + if (rv < 0) + return rv; + rv = register_filesystem(&cramfs_fs_type); + if (rv < 0) + cramfs_uncompress_exit(); + return rv; } static void __exit exit_cramfs_fs(void) |