diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2025-05-01 15:11:17 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-05-01 15:11:38 -0700 |
| commit | 337079d31fb160959f87d7aa22a85b123c500c48 (patch) | |
| tree | f32b3019ffb563257c1fc43159229adcb54cc549 /crypto | |
| parent | Merge branch 'pds_core-cleanups' (diff) | |
| parent | Merge tag 'net-6.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | linux-337079d31fb160959f87d7aa22a85b123c500c48.tar.gz linux-337079d31fb160959f87d7aa22a85b123c500c48.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.15-rc5).
No conflicts or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/scompress.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/scompress.c b/crypto/scompress.c index 36934c78d127..ffeedcf20b0f 100644 --- a/crypto/scompress.c +++ b/crypto/scompress.c @@ -163,11 +163,10 @@ static int crypto_scomp_init_tfm(struct crypto_tfm *tfm) if (ret) goto unlock; } - if (!scomp_scratch_users) { + if (!scomp_scratch_users++) { ret = crypto_scomp_alloc_scratches(); if (ret) - goto unlock; - scomp_scratch_users++; + scomp_scratch_users--; } unlock: mutex_unlock(&scomp_lock); |