diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-02-10 05:26:38 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-02-10 05:26:38 -0500 |
| commit | df9ab9771c64f5229843bfe2a20fe0ee6ac59fc1 (patch) | |
| tree | a091be1024bd76627f78e791e377126e47703b7b /crypto/af_alg.c | |
| parent | ed8f8ce38d0f7b505d7da2d79522972e962457c2 (diff) | |
| parent | 4e1c0664de11e4b5861957ab4ddff2aeeffd042f (diff) | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'crypto/af_alg.c')
| -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 1fa7bc31be63..4665b79c729a 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c | |||
| @@ -455,6 +455,9 @@ void af_alg_complete(struct crypto_async_request *req, int err) | |||
| 455 | { | 455 | { |
| 456 | struct af_alg_completion *completion = req->data; | 456 | struct af_alg_completion *completion = req->data; |
| 457 | 457 | ||
| 458 | if (err == -EINPROGRESS) | ||
| 459 | return; | ||
| 460 | |||
| 458 | completion->err = err; | 461 | completion->err = err; |
| 459 | complete(&completion->completion); | 462 | complete(&completion->completion); |
| 460 | } | 463 | } |