diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-29 18:10:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-29 18:10:54 -0700 |
| commit | 0e47427bc50bd34bd405e207ccf5235f3b78b551 (patch) | |
| tree | 2842deb0af7019a8dbdb333eabbe5f8cab7930a3 | |
| parent | c017d0d1351f916c0ced3f358afc491fdcf490b4 (diff) | |
| parent | a18b989a5c12ca82ed37f94279273ddbc073758a (diff) | |
| download | kernel_samsung_smdk4412-0e47427bc50bd34bd405e207ccf5235f3b78b551.zip kernel_samsung_smdk4412-0e47427bc50bd34bd405e207ccf5235f3b78b551.tar.gz kernel_samsung_smdk4412-0e47427bc50bd34bd405e207ccf5235f3b78b551.tar.bz2 | |
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: caam - fix operator precedence in shared descriptor allocation
| -rw-r--r-- | drivers/crypto/caam/caamalg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c index d0e65d6..676d957 100644 --- a/drivers/crypto/caam/caamalg.c +++ b/drivers/crypto/caam/caamalg.c @@ -238,9 +238,9 @@ static int build_sh_desc_ipsec(struct caam_ctx *ctx) /* build shared descriptor for this session */ sh_desc = kmalloc(CAAM_CMD_SZ * DESC_AEAD_SHARED_TEXT_LEN + - keys_fit_inline ? - ctx->split_key_pad_len + ctx->enckeylen : - CAAM_PTR_SZ * 2, GFP_DMA | GFP_KERNEL); + (keys_fit_inline ? + ctx->split_key_pad_len + ctx->enckeylen : + CAAM_PTR_SZ * 2), GFP_DMA | GFP_KERNEL); if (!sh_desc) { dev_err(jrdev, "could not allocate shared descriptor\n"); return -ENOMEM; |