diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-10 14:35:36 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-10 14:35:36 -0500 |
commit | 4ba24fef3eb3b142197135223b90ced2f319cd53 (patch) | |
tree | a20c125b27740ec7b4c761b11d801108e1b316b2 /crypto/api.c | |
parent | 47c1ffb2b6b630894e9a16442611c056ab21c057 (diff) | |
parent | 98a4a59ee31a12105a2b84f5b8b515ac2cb208ef (diff) |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.20.
Diffstat (limited to 'crypto/api.c')
-rw-r--r-- | crypto/api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/api.c b/crypto/api.c index a2b39c5f3649..2a81e98a0021 100644 --- a/crypto/api.c +++ b/crypto/api.c | |||
@@ -216,11 +216,11 @@ struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask) | |||
216 | 216 | ||
217 | alg = crypto_alg_lookup(name, type, mask); | 217 | alg = crypto_alg_lookup(name, type, mask); |
218 | if (!alg) { | 218 | if (!alg) { |
219 | request_module("%s", name); | 219 | request_module("crypto-%s", name); |
220 | 220 | ||
221 | if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask & | 221 | if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask & |
222 | CRYPTO_ALG_NEED_FALLBACK)) | 222 | CRYPTO_ALG_NEED_FALLBACK)) |
223 | request_module("%s-all", name); | 223 | request_module("crypto-%s-all", name); |
224 | 224 | ||
225 | alg = crypto_alg_lookup(name, type, mask); | 225 | alg = crypto_alg_lookup(name, type, mask); |
226 | } | 226 | } |