diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-12-11 09:57:08 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-12-11 09:57:08 +0900 |
| commit | 8c8081cc599fcafa25371d50959c17e154f9fd08 (patch) | |
| tree | 67af733ebf846c61a5379ef2dfdc3ab1f54de8a2 | |
| parent | 31ca9ff64ae91283436739ce3277facb89c7901d (diff) | |
| parent | 8cef9b451dc6fdf86b92c7a35d55a47465d500db (diff) | |
| download | linux-8c8081cc599fcafa25371d50959c17e154f9fd08.tar.gz | |
Merge tag 'spi-fix-v6.19-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fixes from Mark Brown:
"A few small fixes for SPI that came in during the merge window,
nothing too exciting here"
* tag 'spi-fix-v6.19-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
spi: microchip-core: Fix an error handling path in mchp_corespi_probe()
spi: cadence-qspi: Fix runtime PM imbalance in probe
| -rw-r--r-- | drivers/spi/spi-microchip-core-spi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/spi-microchip-core-spi.c b/drivers/spi/spi-microchip-core-spi.c index 98bf0e6cd00e18..89e40fc45d73aa 100644 --- a/drivers/spi/spi-microchip-core-spi.c +++ b/drivers/spi/spi-microchip-core-spi.c @@ -387,6 +387,7 @@ static int mchp_corespi_probe(struct platform_device *pdev) ret = devm_spi_register_controller(dev, host); if (ret) { + mchp_corespi_disable_ints(spi); mchp_corespi_disable(spi); return dev_err_probe(dev, ret, "unable to register host for CoreSPI controller\n"); } |