diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-11 00:56:08 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-11 00:56:08 -0400 |
| commit | 95f193aa4fe50eb2dc987081d066edd6e13027de (patch) | |
| tree | 1bf995f6290ef824ea8571520de815379d0478a3 /arch/ppc64/boot/zlib.c | |
| parent | e872d4cace8681838e8d18d52c92f4870e980a08 (diff) | |
| parent | bc68552faad0e134eb22281343d5ae5a4873fa80 (diff) | |
| download | kernel_samsung_smdk4412-95f193aa4fe50eb2dc987081d066edd6e13027de.zip kernel_samsung_smdk4412-95f193aa4fe50eb2dc987081d066edd6e13027de.tar.gz kernel_samsung_smdk4412-95f193aa4fe50eb2dc987081d066edd6e13027de.tar.bz2 | |
Merge ../to-linus
Diffstat (limited to 'arch/ppc64/boot/zlib.c')
| -rw-r--r-- | arch/ppc64/boot/zlib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ppc64/boot/zlib.c b/arch/ppc64/boot/zlib.c index 9d5e4e9..78837e8 100644 --- a/arch/ppc64/boot/zlib.c +++ b/arch/ppc64/boot/zlib.c @@ -1307,7 +1307,7 @@ local int huft_build( { *t = (inflate_huft *)Z_NULL; *m = 0; - return Z_OK; + return Z_DATA_ERROR; } @@ -1351,6 +1351,7 @@ local int huft_build( if ((j = *p++) != 0) v[x[j]++] = i; } while (++i < n); + n = x[g]; /* set n to length of v */ /* Generate the Huffman codes and for each, make the table entries */ |