diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-13 18:55:56 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-13 18:55:56 +0100 |
| commit | c0caf7bcbfedb3f79ccec759b221bfef0646ada3 (patch) | |
| tree | 53c4b5850b18a60e7feef1d10b255a18279cdbee /drivers | |
| parent | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | crypto: padlock - Fix AES-CBC handling on odd-block-sized input (diff) | |
| download | linux-c0caf7bcbfedb3f79ccec759b221bfef0646ada3.tar.xz linux-c0caf7bcbfedb3f79ccec759b221bfef0646ada3.zip | |
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: padlock - Fix AES-CBC handling on odd-block-sized input
crypto: n2 - dubious error check
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/crypto/n2_core.c | 2 | ||||
| -rw-r--r-- | drivers/crypto/padlock-aes.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c index 88ee01510ec0..76141262ea1d 100644 --- a/drivers/crypto/n2_core.c +++ b/drivers/crypto/n2_core.c @@ -1832,7 +1832,7 @@ static int __devinit get_irq_props(struct mdesc_handle *mdesc, u64 node, return -ENODEV; ino = mdesc_get_property(mdesc, node, "ino", &ino_len); - if (!intr) + if (!ino) return -ENODEV; if (intr_len != ino_len) 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) |