diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-01 10:01:03 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-01 10:01:39 +0200 |
| commit | a0c6d753ff7f7d3cb3bb359b0d05886c206dfec9 (patch) | |
| tree | 63fbab20f5408a4fca5ba667116918fc84df48e4 /crypto/api.c | |
| parent | 774c913711e73e96719baa9d77e5c1bd717a14c4 (diff) | |
| parent | f796bc40cc381dfc082ae3ff70023aa70a06621f (diff) | |
| download | linux-crypto-a0c6d753ff7f7d3cb3bb359b0d05886c206dfec9.tar.gz linux-crypto-a0c6d753ff7f7d3cb3bb359b0d05886c206dfec9.zip | |
Merge branch 'linus' into perfcounters/core
Merge reason: merge almost-rc8 into perfcounters/core, which was -rc6
based - to pick up the latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'crypto/api.c')
| -rw-r--r-- | crypto/api.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/api.c b/crypto/api.c index 314dab96..fd2545de 100644 --- a/crypto/api.c +++ b/crypto/api.c @@ -221,7 +221,8 @@ struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask) request_module(name); - if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask) && + if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask & + CRYPTO_ALG_NEED_FALLBACK) && snprintf(tmp, sizeof(tmp), "%s-all", name) < sizeof(tmp)) request_module(tmp); |