diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
| commit | 10ce3cc919f50c2043b41ca968b43c26a3672600 (patch) | |
| tree | ea409366a5208aced495bc0516a08b81fd43222e /lib/decompress_unlzma.c | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'lib/decompress_unlzma.c')
| -rw-r--r-- | lib/decompress_unlzma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/decompress_unlzma.c b/lib/decompress_unlzma.c index 476c65af9709..32adb73a9038 100644 --- a/lib/decompress_unlzma.c +++ b/lib/decompress_unlzma.c | |||
| @@ -562,7 +562,7 @@ STATIC inline int INIT unlzma(unsigned char *buf, int in_len, | |||
| 562 | else | 562 | else |
| 563 | inbuf = malloc(LZMA_IOBUF_SIZE); | 563 | inbuf = malloc(LZMA_IOBUF_SIZE); |
| 564 | if (!inbuf) { | 564 | if (!inbuf) { |
| 565 | error("Could not allocate input bufer"); | 565 | error("Could not allocate input buffer"); |
| 566 | goto exit_0; | 566 | goto exit_0; |
| 567 | } | 567 | } |
| 568 | 568 | ||