git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
fs
/
squashfs
/
zlib_wrapper.c
diff --git
a/fs/squashfs/zlib_wrapper.c
b/fs/squashfs/zlib_wrapper.c
index
15a03d0
..
7a60387
100644
(file)
--- a/
fs/squashfs/zlib_wrapper.c
+++ b/
fs/squashfs/zlib_wrapper.c
@@
-128,8
+128,9
@@
static int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
goto release_mutex;
}
+ length = stream->total_out;
mutex_unlock(&msblk->read_data_mutex);
- return
stream->total_out
;
+ return
length
;
release_mutex:
mutex_unlock(&msblk->read_data_mutex);