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/gcm.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/gcm.c')
| -rw-r--r-- | crypto/gcm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crypto/gcm.c b/crypto/gcm.c index b7ad808b..3841b5ea 100644 --- a/crypto/gcm.c +++ b/crypto/gcm.c @@ -152,10 +152,8 @@ static int crypto_gcm_setkey(struct crypto_aead *aead, const u8 *key, err = crypto_skcipher_encrypt(&data->req); if (err == -EINPROGRESS || err == -EBUSY) { - err = wait_for_completion_interruptible( - &data->result.completion); - if (!err) - err = data->result.err; + wait_for_completion(&data->result.completion); + err = data->result.err; } if (err) |