diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-31 07:25:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-31 07:25:10 -0700 |
| commit | 3ad81aa52085a7e67edfa4bc8f518e5962196bb3 (patch) | |
| tree | dab9cbb2ad9031294ce23bf8618fdc43d6020119 /drivers | |
| parent | 2d51cb1792c7b1d8d5daf55cc3eecf19ddc4500c (diff) | |
| parent | 3c9bf72cc1ced1297b235f9422d62b613a3fdae9 (diff) | |
| download | linux-3ad81aa52085a7e67edfa4bc8f518e5962196bb3.tar.gz linux-3ad81aa52085a7e67edfa4bc8f518e5962196bb3.tar.bz2 linux-3ad81aa52085a7e67edfa4bc8f518e5962196bb3.zip | |
Merge tag 'v6.18-p4' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
- Fix double free in aspeed
- Fix req->nbytes clobbering in s390/phmac
* tag 'v6.18-p4' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: aspeed - fix double free caused by devm
crypto: s390/phmac - Do not modify the req->nbytes value
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/crypto/aspeed/aspeed-acry.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/crypto/aspeed/aspeed-acry.c b/drivers/crypto/aspeed/aspeed-acry.c index 8d1c79aaca07..5993bcba9716 100644 --- a/drivers/crypto/aspeed/aspeed-acry.c +++ b/drivers/crypto/aspeed/aspeed-acry.c @@ -787,7 +787,6 @@ static int aspeed_acry_probe(struct platform_device *pdev) err_engine_rsa_start: crypto_engine_exit(acry_dev->crypt_engine_rsa); clk_exit: - clk_disable_unprepare(acry_dev->clk); return rc; } @@ -799,7 +798,6 @@ static void aspeed_acry_remove(struct platform_device *pdev) aspeed_acry_unregister(acry_dev); crypto_engine_exit(acry_dev->crypt_engine_rsa); tasklet_kill(&acry_dev->done_task); - clk_disable_unprepare(acry_dev->clk); } MODULE_DEVICE_TABLE(of, aspeed_acry_of_matches); |