Commit 8c8081cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 31ca9ff6 8cef9b45

drivers/spi/spi-microchip-core-spi.c

+1 −0
Original line number Diff line number Diff line
@@ -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");

	}