diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
| commit | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (patch) | |
| tree | 1cfe20bd31fce1b5b3024384fcb324c3338d1d32 /lib/zlib_inflate/inftrees.c | |
| parent | 702c7e7626deeabb057b6f529167b65ec2eefbdb (diff) | |
| parent | 81065e2f415af6c028eac13f481fb9e60a0b487b (diff) | |
Merge from-linus to-akpm
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 | ||