Commit 99fee6d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4e396db8 2e21630d

drivers/crypto/geode-aes.c

+1 −2
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ 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);



	if (op->dir == AES_DIR_ENCRYPT)