Commit 0e47427b 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: caam - fix operator precedence in shared descriptor allocation
parents c017d0d1 a18b989a

drivers/crypto/caam/caamalg.c

+3 −3
Original line number Diff line number Diff line
@@ -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 ?

			  (keys_fit_inline ?

			   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) {

		dev_err(jrdev, "could not allocate shared descriptor\n");

		return -ENOMEM;