Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[mirror_ubuntu-artful-kernel.git] / crypto / lz4.c

diff --git a/crypto/lz4.c b/crypto/lz4.c
index 4586dd15b0d8909b286c136aedecde335803dc7d..34d072b72a734e14d988aa8b9023ea9069d23079 100644 (file)
--- a/crypto/lz4.c
+++ b/crypto/lz4.c
@@ -68,7 +68,7 @@ static int lz4_decompress_crypto(struct crypto_tfm *tfm, const u8 *src,
        size_t tmp_len = *dlen;
        size_t __slen = slen;
 
-       err = lz4_decompress(src, &__slen, dst, tmp_len);
+       err = lz4_decompress_unknownoutputsize(src, __slen, dst, &tmp_len);
        if (err < 0)
                return -EINVAL;