diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-06 19:42:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-06 19:42:00 +0200 |
| commit | 570d58b12fbf7bae0ba72d929ccf914a4df5ca7c (patch) | |
| tree | dfed4e4970ba5a5a4c4c726b4d55d9f4394683c3 /crypto/scompress.c | |
| parent | 502ad6e5a6196840976c4c84b2ea2f9769942fbe (diff) | |
| parent | 92a09c47464d040866cf2b4cd052bc60555185fb (diff) | |
Merge tag 'v6.15-rc5' into x86/msr, to pick up fixes and to resolve conflicts
Conflicts:
drivers/cpufreq/intel_pstate.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'crypto/scompress.c')
| -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); |