Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Browse source 
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: caam - fix operator precedence in shared descriptor allocation
This commit is contained in:
Linus Torvalds 2011-06-29 18:10:54 -07:00
commit 0e47427bc5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/crypto/caam/caamalg.c
View file

@ -238,9 +238,9 @@ static int build_sh_desc_ipsec(struct caam_ctx *ctx)
/* build shared descriptor for this session */ /* build shared descriptor for this session */
sh_desc = kmalloc(CAAM_CMD_SZ * DESC_AEAD_SHARED_TEXT_LEN + sh_desc = kmalloc(CAAM_CMD_SZ * DESC_AEAD_SHARED_TEXT_LEN +
keys_fit_inline ? (keys_fit_inline ?
ctx->split_key_pad_len + ctx->enckeylen : ctx->split_key_pad_len + ctx->enckeylen :
CAAM_PTR_SZ * 2, GFP_DMA | GFP_KERNEL); CAAM_PTR_SZ * 2), GFP_DMA | GFP_KERNEL);
if (!sh_desc) { if (!sh_desc) {
dev_err(jrdev, "could not allocate shared descriptor\n"); dev_err(jrdev, "could not allocate shared descriptor\n");
return -ENOMEM; return -ENOMEM;