diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-15 16:54:45 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-15 16:54:45 -0700 |
commit | 0d6e29d8da85e74c1b37801469be3974fd706ba7 (patch) | |
tree | 0a5824f6fef63ea2be36406768e8cfe3e6c2457e /crypto/mcryptd.c | |
parent | 2db18d12ffa4131d398564bfc0fb15f26cdf52e5 (diff) | |
parent | 5da64d0814134dc3542fb314a66dcdf74e8553bd (diff) | |
download | linux-crypto-0d6e29d8da85e74c1b37801469be3974fd706ba7.tar.gz linux-crypto-0d6e29d8da85e74c1b37801469be3974fd706ba7.zip |
Merge tag 'v4.5' into next
Merge with Linux 4.5 to get PROPERTY_ENTRY_INTEGER() that is needed to
fix pxa/raumfeld rotary encoder properties.
Diffstat (limited to 'crypto/mcryptd.c')
-rw-r--r-- | crypto/mcryptd.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/crypto/mcryptd.c b/crypto/mcryptd.c index fe5b495a..f78d4fc4 100644 --- a/crypto/mcryptd.c +++ b/crypto/mcryptd.c @@ -128,13 +128,9 @@ static void mcryptd_opportunistic_flush(void) flist = per_cpu_ptr(mcryptd_flist, smp_processor_id()); while (single_task_running()) { mutex_lock(&flist->lock); - if (list_empty(&flist->list)) { - mutex_unlock(&flist->lock); - return; - } - cstate = list_entry(flist->list.next, + cstate = list_first_entry_or_null(&flist->list, struct mcryptd_alg_cstate, flush_list); - if (!cstate->flusher_engaged) { + if (!cstate || !cstate->flusher_engaged) { mutex_unlock(&flist->lock); return; } |