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

spi: sifive: fix controller deregistration 



Make sure to deregister the controller before disabling underlying
resources like interrupts during driver unbind.

Note that clocks were also disabled before the recent commit
140039c2 ("spi: sifive: Simplify clock handling with
devm_clk_get_enabled()").

Fixes: 484a9a68 ("spi: sifive: Add driver for the SiFive SPI controller")
Cc: stable@vger.kernel.org	# 5.1
Cc: Yash Shah <yash.shah@sifive.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260410081757.503099-15-johan@kernel.org


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

drivers/spi/spi-sifive.c

+7 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static int sifive_spi_probe(struct platform_device *pdev) 
	dev_info(&pdev->dev, "mapped; irq=%d, cs=%d\n",

		 irq, host->num_chipselect);



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

	ret = spi_register_controller(host);

	if (ret < 0) {

		dev_err(&pdev->dev, "spi_register_host failed\n");

		goto put_host;
@@ -411,8 +411,14 @@ static void sifive_spi_remove(struct platform_device *pdev) 
	struct spi_controller *host = platform_get_drvdata(pdev);

	struct sifive_spi *spi = spi_controller_get_devdata(host);



	spi_controller_get(host);



	spi_unregister_controller(host);



	/* Disable all the interrupts just in case */

	sifive_spi_write(spi, SIFIVE_SPI_REG_IE, 0);



	spi_controller_put(host);

}



static int sifive_spi_suspend(struct device *dev)