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

spi: dln2: fix controller deregistration 



Make sure to deregister the controller before disabling it to allow
SPI device drivers to do I/O during deregistration.

Fixes: 3d8c0d74 ("spi: add support for DLN-2 USB-SPI adapter")
Cc: stable@vger.kernel.org	# 4.0
Cc: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260409120419.388546-12-johan@kernel.org


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

drivers/spi/spi-dln2.c

+7 −1
Original line number Diff line number Diff line
@@ -758,7 +758,7 @@ static int dln2_spi_probe(struct platform_device *pdev) 
	pm_runtime_set_active(&pdev->dev);

	pm_runtime_enable(&pdev->dev);



	ret = devm_spi_register_controller(&pdev->dev, host);

	ret = spi_register_controller(host);

	if (ret < 0) {

		dev_err(&pdev->dev, "Failed to register host\n");

		goto exit_register;
@@ -783,10 +783,16 @@ static void dln2_spi_remove(struct platform_device *pdev) 
	struct spi_controller *host = platform_get_drvdata(pdev);

	struct dln2_spi *dln2 = spi_controller_get_devdata(host);



	spi_controller_get(host);



	spi_unregister_controller(host);



	pm_runtime_disable(&pdev->dev);



	if (dln2_spi_enable(dln2, false) < 0)

		dev_err(&pdev->dev, "Failed to disable SPI module\n");



	spi_controller_put(host);

}



#ifdef CONFIG_PM_SLEEP