spi: microchip-core: Fix an error handling path in mchp_corespi_probe()

tititiou36 · broonie · commit 8cef9b451dc6 · 2025-12-09T10:01:32.000+09:00
mchp_corespi_init() calls mchp_corespi_enable_ints(), so mchp_corespi_disable_ints() should be called if an error occurs after calling mchp_corespi_init(), as already done in the remove function. Fixes: 059f545 ("spi: add support for microchip "soft" spi controller") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Link: https://patch.msgid.link/a7aaff1f28a83303a288de2914724a874fe1a11e.1764969247.git.christophe.jaillet@wanadoo.fr Acked-by: Conor Dooley <conor.dooley@microchip.com> Signed-off-by: Mark Brown <broonie@kernel.org>
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`	`}`