Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+3
-3
+3
-3
drivers/crypto/caam/caamalg.c
+3
-3
drivers/crypto/caam/caamalg.c
···
238
238
239
239
/* build shared descriptor for this session */
240
240
sh_desc = kmalloc(CAAM_CMD_SZ * DESC_AEAD_SHARED_TEXT_LEN +
241
-
keys_fit_inline ?
242
-
ctx->split_key_pad_len + ctx->enckeylen :
243
-
CAAM_PTR_SZ * 2, GFP_DMA | GFP_KERNEL);
241
+
(keys_fit_inline ?
242
+
ctx->split_key_pad_len + ctx->enckeylen :
243
+
CAAM_PTR_SZ * 2), GFP_DMA | GFP_KERNEL);
244
244
if (!sh_desc) {
245
245
dev_err(jrdev, "could not allocate shared descriptor\n");
246
246
return -ENOMEM;