summaryrefslogtreecommitdiff
path: root/fs/cramfs/uncompress.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-04-08 19:02:50 +0400
committerIngo Molnar <mingo@elte.hu>2009-04-08 19:02:57 +0400
commitff96e612cba32510e263e17b213235fe5746397e (patch)
treea8df57d76b10e0901a4fb76cd2987eb9826a560a /fs/cramfs/uncompress.c
parentcd84a42f315e50edd454c27a3da3951ccd3d735a (diff)
parent577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff)
downloadlinux-ff96e612cba32510e263e17b213235fe5746397e.tar.xz
Merge commit 'v2.6.30-rc1' into core/urgent
Merge reason: need latest upstream to queue up dependent fix Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/cramfs/uncompress.c')
-rw-r--r--fs/cramfs/uncompress.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c
index fc3ccb74626f..023329800d2e 100644
--- a/fs/cramfs/uncompress.c
+++ b/fs/cramfs/uncompress.c
@@ -50,7 +50,7 @@ int cramfs_uncompress_block(void *dst, int dstlen, void *src, int srclen)
err:
printk("Error %d while decompressing!\n", err);
printk("%p(%d)->%p(%d)\n", src, srclen, dst, dstlen);
- return 0;
+ return -EIO;
}
int cramfs_uncompress_init(void)