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

spi: qup: fix controller deregistration 



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

Fixes: 64ff247a ("spi: Add Qualcomm QUP SPI controller support")
Cc: stable@vger.kernel.org	# 3.15
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260410081757.503099-10-johan@kernel.org


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

drivers/spi/spi-qup.c

+7 −1
Original line number Diff line number Diff line
@@ -1193,7 +1193,7 @@ static int spi_qup_probe(struct platform_device *pdev) 
	pm_runtime_set_active(dev);

	pm_runtime_enable(dev);



	ret = devm_spi_register_controller(dev, host);

	ret = spi_register_controller(host);

	if (ret)

		goto disable_pm;
@@ -1320,6 +1320,10 @@ static void spi_qup_remove(struct platform_device *pdev) 
	struct spi_qup *controller = spi_controller_get_devdata(host);

	int ret;



	spi_controller_get(host);



	spi_unregister_controller(host);



	ret = pm_runtime_get_sync(&pdev->dev);



	if (ret >= 0) {
@@ -1339,6 +1343,8 @@ static void spi_qup_remove(struct platform_device *pdev) 


	pm_runtime_put_noidle(&pdev->dev);

	pm_runtime_disable(&pdev->dev);



	spi_controller_put(host);

}



static const struct of_device_id spi_qup_dt_match[] = {