diff options
| author | Linus Torvalds | 2022-03-31 11:17:39 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2022-03-31 11:17:39 -0700 |
| commit | 93235e3df29c084a37e0daed17801c6adfce4cb6 (patch) | |
| tree | fa69253ba2d70050522e605e2b089e5888fa9223 /drivers/crypto | |
| parent | 787af64d05cd528aac9ad16752d11bb1c6061bb9 (diff) | |
| parent | aa8e73eed7d3084c18dd16d195748661c7e881b5 (diff) | |
Merge tag 'v5.18-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
- Missing Kconfig dependency on arm that leads to boot failure
- x86 SLS fixes
- Reference leak in the stm32 driver
* tag 'v5.18-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: x86/sm3 - Fixup SLS
crypto: x86/poly1305 - Fixup SLS
crypto: x86/chacha20 - Avoid spurious jumps to other functions
crypto: stm32 - fix reference leak in stm32_crc_remove
crypto: arm/aes-neonbs-cbc - Select generic cbc and aes
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/stm32/stm32-crc32.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/crypto/stm32/stm32-crc32.c b/drivers/crypto/stm32/stm32-crc32.c index be1bf39a317d..90a920e7f664 100644 --- a/drivers/crypto/stm32/stm32-crc32.c +++ b/drivers/crypto/stm32/stm32-crc32.c @@ -384,8 +384,10 @@ static int stm32_crc_remove(struct platform_device *pdev) struct stm32_crc *crc = platform_get_drvdata(pdev); int ret = pm_runtime_get_sync(crc->dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put_noidle(crc->dev); return ret; + } spin_lock(&crc_list.lock); list_del(&crc->list); |