git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Blackfin: drop cpu_callin_map on SMP systems
[safe/jmp/linux-2.6]
/
crypto
/
des_generic.c
diff --git
a/crypto/des_generic.c
b/crypto/des_generic.c
index
5bd3ee3
..
249f903
100644
(file)
--- a/
crypto/des_generic.c
+++ b/
crypto/des_generic.c
@@
-869,8
+869,7
@@
static int des3_ede_setkey(struct crypto_tfm *tfm, const u8 *key,
if (unlikely(!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||
!((K[2] ^ K[4]) | (K[3] ^ K[5]))) &&
- (*flags & CRYPTO_TFM_REQ_WEAK_KEY))
- {
+ (*flags & CRYPTO_TFM_REQ_WEAK_KEY)) {
*flags |= CRYPTO_TFM_RES_WEAK_KEY;
return -EINVAL;
}