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 remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes
[pandora-kernel.git]
/
fs
/
squashfs
/
xz_wrapper.c
diff --git
a/fs/squashfs/xz_wrapper.c
b/fs/squashfs/xz_wrapper.c
index
856756c
..
c4eb400
100644
(file)
--- a/
fs/squashfs/xz_wrapper.c
+++ b/
fs/squashfs/xz_wrapper.c
@@
-95,12
+95,6
@@
static int squashfs_xz_uncompress(struct squashfs_sb_info *msblk, void **buffer,
if (!buffer_uptodate(bh[k]))
goto release_mutex;
- if (avail == 0) {
- offset = 0;
- put_bh(bh[k++]);
- continue;
- }
-
stream->buf.in = bh[k]->b_data + offset;
stream->buf.in_size = avail;
stream->buf.in_pos = 0;