Merge tag 'v4.9-rc1' into patchwork

[karo-tx-linux.git] / drivers / crypto / img-hash.c

diff --git a/drivers/crypto/img-hash.c b/drivers/crypto/img-hash.c
index fd4cd5120f9e7cdaa6ed09254f40c6a2b57fa217..a2e77b87485bea56ae00ba9df51d06eafae315a7 100644 (file)
--- a/drivers/crypto/img-hash.c
+++ b/drivers/crypto/img-hash.c
@@ -686,6 +686,7 @@ static int img_hash_cra_init(struct crypto_tfm *tfm, const char *alg_name)
        }
        crypto_ahash_set_reqsize(__crypto_ahash_cast(tfm),
                                 sizeof(struct img_hash_request_ctx) +
+                                crypto_ahash_reqsize(ctx->fallback) +
                                 IMG_HASH_DMA_THRESHOLD);
 
        return 0;
@@ -1031,7 +1032,7 @@ static int img_hash_probe(struct platform_device *pdev)
        err = img_register_algs(hdev);
        if (err)
                goto err_algs;
-       dev_dbg(dev, "Img MD5/SHA1/SHA224/SHA256 Hardware accelerator initialized\n");
+       dev_info(dev, "Img MD5/SHA1/SHA224/SHA256 Hardware accelerator initialized\n");
 
        return 0;