Merge tag 'spi-fix-v6.19-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

torvalds · torvalds · commit 8c8081cc599f · 2025-12-11T09:57:08.000+09:00
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
diff --git 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");
 	}

Original file line number	Diff line number	Diff line change
`@@ -387,6 +387,7 @@ static int mchp_corespi_probe(struct platform_device *pdev)`
`387`	`387`
`388`	`388`	`ret = devm_spi_register_controller(dev, host);`
`389`	`389`	`if (ret) {`
	`390`	`+ mchp_corespi_disable_ints(spi);`
`390`	`391`	`mchp_corespi_disable(spi);`
`391`	`392`	`return dev_err_probe(dev, ret, "unable to register host for CoreSPI controller\n");`
`392`	`393`	`}`