summaryrefslogtreecommitdiff
path: root/crypto/algapi.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-01-25 07:17:10 -0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-01-25 07:17:10 -0200
commitd59b00b774545f6fd9816fc7e59dbe75b1cfea57 (patch)
treea3be473af860a8330fcedd0d1ed4070f2453b35f /crypto/algapi.c
parent5096a469f3f9cca036d3ed147b8a01fcd3d2ef20 (diff)
parentbda6ce80cecffe35ca7f5ddbdf6003ceacab1418 (diff)
downloadlinux-crypto-d59b00b774545f6fd9816fc7e59dbe75b1cfea57.tar.gz
linux-crypto-d59b00b774545f6fd9816fc7e59dbe75b1cfea57.zip
Merge tag 'v4.5-rc1' into patchwork
Linux 4.5-rc1 * tag 'v4.5-rc1': (11309 commits) Linux 4.5-rc1 ideapad-laptop: Add Lenovo Yoga 700 to no_hw_rfkill dmi list MAINTAINERS: Combine multiple telemetry entries intel_telemetry_debugfs: Fix unused warnings in telemetry debugfs vmstat: Remove BUG_ON from vmstat_update MIPS: zboot: Add support for serial debug using the PROM MIPS: zboot: Avoid useless rebuilds MIPS: BMIPS: Enable ARCH_WANT_OPTIONAL_GPIOLIB MIPS: bcm63xx: nvram: Remove unused bcm63xx_nvram_get_psi_size() function MIPS: bcm963xx: Update bcm_tag field image_sequence MIPS: bcm963xx: Move extended flash address to bcm_tag header file MIPS: bcm963xx: Move Broadcom BCM963xx image tag data structure MIPS: bcm63xx: nvram: Use nvram structure definition from header file MIPS: bcm963xx: Add Broadcom BCM963xx board nvram data structure MAINTAINERS: Add KVM for MIPS entry MIPS: KVM: Add missing newline to kvm_err() MIPS: Move KVM specific opcodes into asm/inst.h MIPS: KVM: Use cacheops.h definitions MIPS: Break down cacheops.h definitions MIPS: Use EXCCODE_ constants with set_except_vector() ...
Diffstat (limited to 'crypto/algapi.c')
-rw-r--r--crypto/algapi.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/crypto/algapi.c b/crypto/algapi.c
index 59bf491f..7be76aa3 100644
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -93,16 +93,15 @@ static struct list_head *crypto_more_spawns(struct crypto_alg *alg,
{
struct crypto_spawn *spawn, *n;
- if (list_empty(stack))
+ spawn = list_first_entry_or_null(stack, struct crypto_spawn, list);
+ if (!spawn)
return NULL;
- spawn = list_first_entry(stack, struct crypto_spawn, list);
- n = list_entry(spawn->list.next, struct crypto_spawn, list);
+ n = list_next_entry(spawn, list);
if (spawn->alg && &n->list != stack && !n->alg)
n->alg = (n->list.next == stack) ? alg :
- &list_entry(n->list.next, struct crypto_spawn,
- list)->inst->alg;
+ &list_next_entry(n, list)->inst->alg;
list_move(&spawn->list, secondary_spawns);