git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usb: quirks: add delay init quirk for Corsair Strafe RGB keyboard
[pandora-kernel.git]
/
crypto
/
algapi.c
diff --git
a/crypto/algapi.c
b/crypto/algapi.c
index
54dd4e3
..
2f19548
100644
(file)
--- a/
crypto/algapi.c
+++ b/
crypto/algapi.c
@@
-342,7
+342,7
@@
static void crypto_wait_for_test(struct crypto_larval *larval)
crypto_alg_tested(larval->alg.cra_driver_name, 0);
}
crypto_alg_tested(larval->alg.cra_driver_name, 0);
}
- err = wait_for_completion_
interrupti
ble(&larval->completion);
+ err = wait_for_completion_
killa
ble(&larval->completion);
WARN_ON(err);
out:
WARN_ON(err);
out:
@@
-354,6
+354,7
@@
int crypto_register_alg(struct crypto_alg *alg)
struct crypto_larval *larval;
int err;
struct crypto_larval *larval;
int err;
+ alg->cra_flags &= ~CRYPTO_ALG_DEAD;
err = crypto_check_alg(alg);
if (err)
return err;
err = crypto_check_alg(alg);
if (err)
return err;
@@
-477,7
+478,8
@@
static struct crypto_template *__crypto_lookup_template(const char *name)
struct crypto_template *crypto_lookup_template(const char *name)
{
struct crypto_template *crypto_lookup_template(const char *name)
{
- return try_then_request_module(__crypto_lookup_template(name), name);
+ return try_then_request_module(__crypto_lookup_template(name),
+ "crypto-%s", name);
}
EXPORT_SYMBOL_GPL(crypto_lookup_template);
}
EXPORT_SYMBOL_GPL(crypto_lookup_template);