diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:02:04 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:02:04 -0400 |
| commit | b2382b363df828f25e35ed8b70a3da33b29b2a64 (patch) | |
| tree | 23aa2e70ba4650390c9281b3696172313bdb0f38 /lib/zlib_inflate/inftrees.c | |
| parent | 1b5cca3a88b7682d538d129c25f0e3092613a243 (diff) | |
| parent | 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff) | |
Merge upstream into ieee80211.
Hand-fix merge conflict in drivers/usb/net/zd1201.c.
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 | ||