mirror of
https://github.com/torvalds/linux.git
synced 2026-05-12 16:18:45 +02:00
spi: coldfire-qspi: fix controller deregistration
Make sure to deregister the controller before disabling underlying
resources like clocks (via runtime pm) during driver unbind.
Fixes: 34b8c66173 ("spi: Add Freescale/Motorola Coldfire QSPI driver")
Cc: stable@vger.kernel.org # 2.6.34
Cc: Steven King <sfking@fdwdc.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260409120419.388546-11-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
dbb6b01267
commit
e7c510e192
|
|
@ -410,9 +410,9 @@ static int mcfqspi_probe(struct platform_device *pdev)
|
|||
platform_set_drvdata(pdev, host);
|
||||
pm_runtime_enable(&pdev->dev);
|
||||
|
||||
status = devm_spi_register_controller(&pdev->dev, host);
|
||||
status = spi_register_controller(host);
|
||||
if (status) {
|
||||
dev_dbg(&pdev->dev, "devm_spi_register_controller failed\n");
|
||||
dev_dbg(&pdev->dev, "failed to register controller\n");
|
||||
goto fail1;
|
||||
}
|
||||
|
||||
|
|
@ -436,11 +436,17 @@ static void mcfqspi_remove(struct platform_device *pdev)
|
|||
struct spi_controller *host = platform_get_drvdata(pdev);
|
||||
struct mcfqspi *mcfqspi = spi_controller_get_devdata(host);
|
||||
|
||||
spi_controller_get(host);
|
||||
|
||||
spi_unregister_controller(host);
|
||||
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
/* disable the hardware (set the baud rate to 0) */
|
||||
mcfqspi_wr_qmr(mcfqspi, MCFQSPI_QMR_MSTR);
|
||||
|
||||
mcfqspi_cs_teardown(mcfqspi);
|
||||
|
||||
spi_controller_put(host);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user