diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 13:57:42 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 13:57:42 -0500 |
| commit | 5c6baba84e1ac6a79b266b40e17e692aab6604a1 (patch) | |
| tree | 6ba34db1109107023d753dd9fd5c359b3b990a04 /lib/decompress_bunzip2.c | |
| parent | 893f38d144a4d96d2483cd7c3801d26e1b2c23e9 (diff) | |
| parent | 3ef884b4c04e857c283cc77ca70ad8f638d94b0e (diff) | |
Merge commit 'linus/master' into x86/urgent
Diffstat (limited to 'lib/decompress_bunzip2.c')
| -rw-r--r-- | lib/decompress_bunzip2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c index 600f473a5610..76074209f9a2 100644 --- a/lib/decompress_bunzip2.c +++ b/lib/decompress_bunzip2.c | |||
| @@ -299,7 +299,7 @@ static int INIT get_next_block(struct bunzip_data *bd) | |||
| 299 | again when using them (during symbol decoding).*/ | 299 | again when using them (during symbol decoding).*/ |
| 300 | base = hufGroup->base-1; | 300 | base = hufGroup->base-1; |
| 301 | limit = hufGroup->limit-1; | 301 | limit = hufGroup->limit-1; |
| 302 | /* Calculate permute[]. Concurently, initialize | 302 | /* Calculate permute[]. Concurrently, initialize |
| 303 | * temp[] and limit[]. */ | 303 | * temp[] and limit[]. */ |
| 304 | pp = 0; | 304 | pp = 0; |
| 305 | for (i = minLen; i <= maxLen; i++) { | 305 | for (i = minLen; i <= maxLen; i++) { |