summaryrefslogtreecommitdiffstats
path: root/fs/cramfs/uncompress.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-30 23:55:03 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-30 23:55:03 -0400
commite993835441734c184d70d3716eed78a08eeb71c2 (patch)
tree583aa17813cdae1c4640e353f8c6df3f197e7548 /fs/cramfs/uncompress.c
parent360f654e7cda850034f3f6252a7a7cff3fa77356 (diff)
parent1bdfd554be94def718323659173517c5d4a69d25 (diff)
downloadlinux-e993835441734c184d70d3716eed78a08eeb71c2.tar.gz
linux-e993835441734c184d70d3716eed78a08eeb71c2.tar.bz2
linux-e993835441734c184d70d3716eed78a08eeb71c2.zip
Merge branch 'master' into upstream
Diffstat (limited to 'fs/cramfs/uncompress.c')
-rw-r--r--fs/cramfs/uncompress.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c
index 8def89f2c438..fc3ccb74626f 100644
--- a/fs/cramfs/uncompress.c
+++ b/fs/cramfs/uncompress.c
@@ -68,11 +68,10 @@ int cramfs_uncompress_init(void)
return 0;
}
-int cramfs_uncompress_exit(void)
+void cramfs_uncompress_exit(void)
{
if (!--initialized) {
zlib_inflateEnd(&stream);
vfree(stream.workspace);
}
- return 0;
}