summaryrefslogtreecommitdiff
path: root/crypto/algapi.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-11-01 00:15:30 -0400
committerDavid S. Miller <davem@davemloft.net>2015-11-01 00:15:30 -0400
commitf6bf086cf8a67c9f14de5b71cf7d9c03f042f057 (patch)
tree766d1422054a6dc11ed1f04619bd0936991dfd68 /crypto/algapi.c
parent7dadc1e2446dcf75527b5b8a9b8dc9f434a78785 (diff)
parentfbac254eaaaf03131033caa87420f9af2e273907 (diff)
downloadlinux-crypto-f6bf086cf8a67c9f14de5b71cf7d9c03f042f057.tar.gz
linux-crypto-f6bf086cf8a67c9f14de5b71cf7d9c03f042f057.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to '')
-rw-r--r--crypto/algapi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/algapi.c b/crypto/algapi.c
index d130b41d..59bf491f 100644
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -345,7 +345,7 @@ static void crypto_wait_for_test(struct crypto_larval *larval)
crypto_alg_tested(larval->alg.cra_driver_name, 0);
}
- err = wait_for_completion_interruptible(&larval->completion);
+ err = wait_for_completion_killable(&larval->completion);
WARN_ON(err);
out: