diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-08 18:54:19 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-08 18:54:19 +0000 |
| commit | 297e25caff999eeccf24b19e62388450763af15d (patch) | |
| tree | d06f1728869142bf7302d9307e2ef63b97348ebc /crypto | |
| parent | 82a1d391250090e057c99b3bede44c048537bf8d (diff) | |
| parent | c3b70f0bbb6a883f4afa639286043d3f71fbbddf (diff) | |
Merge tag 'v3.14.28' into linux-linaro-lsk-v3.14
This is the 3.14.28 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 6a3ad8011585..1de4beeb25f8 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); } |