diff options
author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2017-06-14 16:12:40 +0200 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2017-06-14 16:12:40 +0200 |
commit | b1d622fc5293ae805065a0fe3bf74cc2cc1bc5f4 (patch) | |
tree | 6b984a37fa4e4acdb9512719c7de1e84610a6242 /crypto/lz4.c | |
parent | 4c6427919ee920d5963cf826de76292286342aa0 (diff) | |
parent | 0930c08c6bc50a3a62ee3c90fad305840affbaf2 (diff) | |
download | linux-crypto-b1d622fc5293ae805065a0fe3bf74cc2cc1bc5f4.tar.gz linux-crypto-b1d622fc5293ae805065a0fe3bf74cc2cc1bc5f4.zip |
Merge tag 'v4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Linux 4.12-rc5
Diffstat (limited to 'crypto/lz4.c')
-rw-r--r-- | crypto/lz4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/lz4.c b/crypto/lz4.c index 71eff9b0..2ce2660d 100644 --- a/crypto/lz4.c +++ b/crypto/lz4.c @@ -97,7 +97,7 @@ static int __lz4_decompress_crypto(const u8 *src, unsigned int slen, int out_len = LZ4_decompress_safe(src, dst, slen, *dlen); if (out_len < 0) - return out_len; + return -EINVAL; *dlen = out_len; return 0; |