diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2017-06-14 16:12:40 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2017-06-14 16:12:40 +0200 |
| commit | b1d622fc5293ae805065a0fe3bf74cc2cc1bc5f4 (patch) | |
| tree | 6b984a37fa4e4acdb9512719c7de1e84610a6242 /crypto/gcm.c | |
| parent | 4c6427919ee920d5963cf826de76292286342aa0 (diff) | |
| parent | 0930c08c6bc50a3a62ee3c90fad305840affbaf2 (diff) | |
| download | linux-crypto-b1d622fc5293ae805065a0fe3bf74cc2cc1bc5f4.tar.gz linux-crypto-b1d622fc5293ae805065a0fe3bf74cc2cc1bc5f4.zip | |
Merge tag 'v4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Linux 4.12-rc5
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) |