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

spi: tegra20-sflash: fix controller deregistration 



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

Fixes: f12f7318 ("spi: tegra20-sflash: use devm_spi_register_master()")
Cc: stable@vger.kernel.org	# 3.13
Cc: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260410081757.503099-23-johan@kernel.org


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

drivers/spi/spi-tegra20-sflash.c

+7 −1
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ static int tegra_sflash_probe(struct platform_device *pdev) 
	tegra_sflash_writel(tsd, tsd->def_command_reg, SPI_COMMAND);

	pm_runtime_put(&pdev->dev);



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

	ret = spi_register_controller(host);

	if (ret < 0) {

		dev_err(&pdev->dev, "can not register to host err %d\n", ret);

		goto exit_pm_disable;
@@ -528,11 +528,17 @@ static void tegra_sflash_remove(struct platform_device *pdev) 
	struct spi_controller *host = platform_get_drvdata(pdev);

	struct tegra_sflash_data	*tsd = spi_controller_get_devdata(host);



	spi_controller_get(host);



	spi_unregister_controller(host);



	free_irq(tsd->irq, tsd);



	pm_runtime_disable(&pdev->dev);

	if (!pm_runtime_status_suspended(&pdev->dev))

		tegra_sflash_runtime_suspend(&pdev->dev);



	spi_controller_put(host);

}



#ifdef CONFIG_PM_SLEEP