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/drbg.c | |
| parent | bcf741cb779283081db47853264cc94854e7ad83 (diff) | |
| parent | 019d62db54017f4639fd7d4f6592f5a116a16695 (diff) | |
| download | linux-035f901eac4d2d0fd40f3055026355d55d46949f.tar.bz2 | |
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/drbg.c')
| -rw-r--r-- | crypto/drbg.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/drbg.c b/crypto/drbg.c index 433c4258e484..633a88e93ab0 100644 --- a/crypto/drbg.c +++ b/crypto/drbg.c @@ -1768,9 +1768,8 @@ static int drbg_kcapi_sym_ctr(struct drbg_state *drbg, break; case -EINPROGRESS: case -EBUSY: - ret = wait_for_completion_interruptible( - &drbg->ctr_completion); - if (!ret && !drbg->ctr_async_err) { + wait_for_completion(&drbg->ctr_completion); + if (!drbg->ctr_async_err) { reinit_completion(&drbg->ctr_completion); break; } |