summaryrefslogtreecommitdiff
path: root/crypto/gcm.c
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2017-09-27 10:48:34 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2017-09-27 10:48:34 +0200
commit3f5660b1cbb09c65319c452ca9dc26a572aacc6d (patch)
treea64b5100d2b8a50176a998657b7cc142d48c4c2f /crypto/gcm.c
parent3f68dc7c600c0354f5df7f06b931661319addafb (diff)
parent346ae4600d05c8488abcda40bb4ca8dbcbbeacc0 (diff)
Merge remote-tracking branch 'fslc/4.1-2.0.x-imx' into toradex_4.1-2.0.x-imx
Diffstat (limited to 'crypto/gcm.c')
-rw-r--r--crypto/gcm.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/crypto/gcm.c b/crypto/gcm.c
index ee3c29bd7ddb..59b6ffe6c81b 100644
--- a/crypto/gcm.c
+++ b/crypto/gcm.c
@@ -146,10 +146,8 @@ static int crypto_gcm_setkey(struct crypto_aead *aead, const u8 *key,
err = crypto_ablkcipher_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)