diff options
| author | Colin Cross <ccross@android.com> | 2010-12-21 18:34:37 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-12-21 18:34:37 -0800 |
| commit | b104a07edb2a319f734ddc4fe04852865d8d9e24 (patch) | |
| tree | a0cd50b3d84ece4d94e366fac4b440e380c2d247 /drivers/crypto | |
| parent | e87ec4d59e1f96381547e614c5279bed63775719 (diff) | |
| parent | a1346c99fc89f2b3d35c7d7e2e4aef8ea4124342 (diff) | |
Merge commit 'v2.6.36.2' into linux-tegra-2.6.36
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/padlock-aes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c index 2e992bc8015b..8a515baa38f7 100644 --- a/drivers/crypto/padlock-aes.c +++ b/drivers/crypto/padlock-aes.c @@ -286,7 +286,7 @@ static inline u8 *padlock_xcrypt_cbc(const u8 *input, u8 *output, void *key, if (initial) asm volatile (".byte 0xf3,0x0f,0xa7,0xd0" /* rep xcryptcbc */ : "+S" (input), "+D" (output), "+a" (iv) - : "d" (control_word), "b" (key), "c" (count)); + : "d" (control_word), "b" (key), "c" (initial)); asm volatile (".byte 0xf3,0x0f,0xa7,0xd0" /* rep xcryptcbc */ : "+S" (input), "+D" (output), "+a" (iv) |