diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-27 08:30:07 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-27 08:30:07 -0400 |
commit | efda9452046bdd707b23a85b7846ec33548f84f1 (patch) | |
tree | f08c915049ea1829ba115cd41a0ba28ddf184e07 /lib/zlib_inflate/inftrees.c | |
parent | b01f2cc1c37ac3d5ca313c90370a586dffe5aca9 (diff) | |
parent | 36676bcbf9f6bcbea9d06e67ee8d04eacde54952 (diff) |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'lib/zlib_inflate/inftrees.c')
-rw-r--r-- | lib/zlib_inflate/inftrees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/zlib_inflate/inftrees.c b/lib/zlib_inflate/inftrees.c index c5f66fbb0dd0..874950ec4858 100644 --- a/lib/zlib_inflate/inftrees.c +++ b/lib/zlib_inflate/inftrees.c | |||
@@ -141,7 +141,7 @@ static int huft_build( | |||
141 | { | 141 | { |
142 | *t = NULL; | 142 | *t = NULL; |
143 | *m = 0; | 143 | *m = 0; |
144 | return Z_DATA_ERROR; | 144 | return Z_OK; |
145 | } | 145 | } |
146 | 146 | ||
147 | 147 | ||