diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2017-07-05 15:17:26 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-07-05 15:17:26 +0800 |
| commit | 57cf4e9e5232e3706cc4894ba1706eb3e7352e14 (patch) | |
| tree | 0460f5eef8f2a92db57b710c5617cc7b50cc4d54 /crypto/asymmetric_keys/public_key.c | |
| parent | 3a61ba3cbde9cd55a38b85616cd4764a2130dcd1 (diff) | |
| parent | 72506e470afe1e7c1bedf056c5411a2a87c750e4 (diff) | |
| download | linux-crypto-57cf4e9e5232e3706cc4894ba1706eb3e7352e14.tar.gz linux-crypto-57cf4e9e5232e3706cc4894ba1706eb3e7352e14.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pull in fixes for the next merge window.
Diffstat (limited to 'crypto/asymmetric_keys/public_key.c')
| -rw-r--r-- | crypto/asymmetric_keys/public_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c index d3a989e7..3cd6e12c 100644 --- a/crypto/asymmetric_keys/public_key.c +++ b/crypto/asymmetric_keys/public_key.c @@ -141,7 +141,7 @@ int public_key_verify_signature(const struct public_key *pkey, * signature and returns that to us. */ ret = crypto_akcipher_verify(req); - if (ret == -EINPROGRESS) { + if ((ret == -EINPROGRESS) || (ret == -EBUSY)) { wait_for_completion(&compl.completion); ret = compl.err; } |