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 | 035f901eac4d2d0fd40f3055026355d55d46949f (patch) | |
tree | 26e818b4365af13540927e3e44916cf228d1262c /crypto/asymmetric_keys/public_key.c | |
parent | bcf741cb779283081db47853264cc94854e7ad83 (diff) | |
parent | 019d62db54017f4639fd7d4f6592f5a116a16695 (diff) |
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 d3a989e718f5..3cd6e12cfc46 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; } |