diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-08 18:54:04 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-08 18:54:04 +0000 |
| commit | bbba26b2fc88c77239ebcd45d7fb669018511dfe (patch) | |
| tree | a272377f258a675ca2723af43ac14ae1e92c22e6 /crypto | |
| parent | b57438e86302b9a0b175c183827bc4171552d8f9 (diff) | |
| parent | 46a490cc58e717f8058b878635c11535583840d2 (diff) | |
Merge tag 'v3.10.64' into linux-linaro-lsk
This is the 3.10.64 stable release
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/af_alg.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c index bf948e134981..6ef6e2ad344e 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -449,6 +449,9 @@ void af_alg_complete(struct crypto_async_request *req, int err) { struct af_alg_completion *completion = req->data; + if (err == -EINPROGRESS) + return; + completion->err = err; complete(&completion->completion); } |