summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-14 19:17:07 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-14 19:17:07 -0800
commit99fee6d7e5748d96884667a4628118f7fc130ea0 (patch)
tree93ab9c3eae9e4f8b03deb88e7c3a3db39f435fdf /drivers
parent4e396db8034cd5566a6b77716c15954b533090a6 (diff)
parent2e21630ddc3fb717dc645356b75771c6a52dc627 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] geode: Fix not inplace encryption
Diffstat (limited to 'drivers')
-rw-r--r--drivers/crypto/geode-aes.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/crypto/geode-aes.c b/drivers/crypto/geode-aes.c
index f9a34abbf4fa..711e246e1ef0 100644
--- a/drivers/crypto/geode-aes.c
+++ b/drivers/crypto/geode-aes.c
@@ -110,8 +110,7 @@ geode_aes_crypt(struct geode_aes_op *op)
* we don't need to worry
*/
- if (op->src == op->dst)
- flags |= (AES_CTRL_DCA | AES_CTRL_SCA);
+ flags |= (AES_CTRL_DCA | AES_CTRL_SCA);
if (op->dir == AES_DIR_ENCRYPT)
flags |= AES_CTRL_ENCRYPT;