diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-04 23:33:12 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-04 23:33:12 +0300 |
| commit | c13aca79ff3c4af5fd31a5b2743a90eba6e36a26 (patch) | |
| tree | 8f77894f61822d1ae5285c07c801af7c62f71afd /drivers/crypto/ccp/ccp-crypto-sha.c | |
| parent | 40f7090bb1b4ec327ea1e1402ff5783af5b35195 (diff) | |
| parent | 5ca4d1ae9bad0f59bd6f851c39b19f5366953666 (diff) | |
| download | linux-c13aca79ff3c4af5fd31a5b2743a90eba6e36a26.tar.xz | |
Merge branch 'next' into for-linus
Prepare input updates for 4.18 merge window.
Diffstat (limited to 'drivers/crypto/ccp/ccp-crypto-sha.c')
| -rw-r--r-- | drivers/crypto/ccp/ccp-crypto-sha.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/ccp/ccp-crypto-sha.c b/drivers/crypto/ccp/ccp-crypto-sha.c index 8b9b16d433f7..871c9628a2ee 100644 --- a/drivers/crypto/ccp/ccp-crypto-sha.c +++ b/drivers/crypto/ccp/ccp-crypto-sha.c @@ -47,7 +47,7 @@ static int ccp_sha_complete(struct crypto_async_request *async_req, int ret) } /* Update result area if supplied */ - if (req->result) + if (req->result && rctx->final) memcpy(req->result, rctx->ctx, digest_size); e_free: |