aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2025-04-09 21:33:40 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2025-04-09 21:33:40 +0800
commit5322584385d938773cbb562db64d8423dd5fd026 (patch)
tree472e5f9ede85ab1b17fc2b73068bfacf46c40f5c /crypto
parentaf7e23c616f523b1c4d1f5f0cd7f9852fa4aa24f (diff)
parentb7b39df7e710b0068356e4c696af07aa10e2cd3d (diff)
downloadnet-5322584385d938773cbb562db64d8423dd5fd026.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge crypto tree to pick up scompress and caam fixes. The scompress fix has a non-trivial resolution as the code in question has moved over to acompress.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/acompress.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/acompress.c b/crypto/acompress.c
index 70bc1fd044e446..5807b87bb50812 100644
--- a/crypto/acompress.c
+++ b/crypto/acompress.c
@@ -483,6 +483,9 @@ void crypto_acomp_free_streams(struct crypto_acomp_streams *s)
void (*free_ctx)(void *);
int i;
+ if (!streams)
+ return;
+
cancel_work_sync(&s->stream_work);
free_ctx = s->free_ctx;