diff options
| author | Juergen Gross <jgross@suse.com> | 2018-01-29 15:54:46 +0100 |
|---|---|---|
| committer | Juergen Gross <jgross@suse.com> | 2018-01-29 15:54:46 +0100 |
| commit | fe8cbbbc0e68dad845f72ad75c8099b88f7ff049 (patch) | |
| tree | 2bf17da93b86508fe2f66e87f39897a1d4b403dc /crypto/cts.c | |
| parent | 40248a5f572a9ee5602fb61b33ddcc7de3b4cf5b (diff) | |
| parent | 21864b027d847a6d91903a5ba219770403ba8aad (diff) | |
| download | linux-crypto-fe8cbbbc0e68dad845f72ad75c8099b88f7ff049.tar.gz linux-crypto-fe8cbbbc0e68dad845f72ad75c8099b88f7ff049.zip | |
Merge branch 'master' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Diffstat (limited to '')
| -rw-r--r-- | crypto/cts.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crypto/cts.c b/crypto/cts.c index 243f591d..4773c188 100644 --- a/crypto/cts.c +++ b/crypto/cts.c @@ -136,8 +136,7 @@ static void crypto_cts_encrypt_done(struct crypto_async_request *areq, int err) goto out; err = cts_cbc_encrypt(req); - if (err == -EINPROGRESS || - (err == -EBUSY && req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)) + if (err == -EINPROGRESS || err == -EBUSY) return; out: @@ -229,8 +228,7 @@ static void crypto_cts_decrypt_done(struct crypto_async_request *areq, int err) goto out; err = cts_cbc_decrypt(req); - if (err == -EINPROGRESS || - (err == -EBUSY && req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)) + if (err == -EINPROGRESS || err == -EBUSY) return; out: |