Unverified Commit e506a700 authored by Johan Hovold's avatar Johan Hovold Committed by Mark Brown
Browse files

spi: fsl-espi: fix controller deregistration 



Make sure to deregister the controller before disabling runtime PM
(which can leave the controller disabled) to allow SPI device drivers to
do I/O during deregistration.

Fixes: e9abb4db ("spi: fsl-espi: add runtime PM")
Cc: stable@vger.kernel.org	# 4.3
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260409120419.388546-14-johan@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f4838934

drivers/spi/spi-fsl-espi.c

+9 −1
Original line number Diff line number Diff line
@@ -718,7 +718,7 @@ static int fsl_espi_probe(struct device *dev, struct resource *mem, 
	pm_runtime_enable(dev);

	pm_runtime_get_sync(dev);



	ret = devm_spi_register_controller(dev, host);

	ret = spi_register_controller(host);

	if (ret < 0)

		goto err_pm;
@@ -782,7 +782,15 @@ static int of_fsl_espi_probe(struct platform_device *ofdev) 


static void of_fsl_espi_remove(struct platform_device *dev)

{

	struct spi_controller *host = platform_get_drvdata(dev);



	spi_controller_get(host);



	spi_unregister_controller(host);



	pm_runtime_disable(&dev->dev);



	spi_controller_put(host);

}



#ifdef CONFIG_PM_SLEEP