Skip to content

Commit db96551

Browse files
jhovoldgregkh
authored andcommitted
spi: ti-qspi: fix controller deregistration
[ Upstream commit 0c18a1b ] Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Note that the controller is suspended before disabling and releasing resources since commit 3ac066e ("spi: spi-ti-qspi: Suspend the queue before removing the device") which avoids issues like unclocked accesses but prevents SPI device drivers from doing I/O during deregistration. Fixes: 3b3a800 ("spi: ti-qspi: one only one interrupt handler") Cc: stable@vger.kernel.org # 3.13 Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Johan Hovold <johan@kernel.org> Link: https://patch.msgid.link/20260410081757.503099-24-johan@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 25ba53c commit db96551

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

drivers/spi/spi-ti-qspi.c

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ static int ti_qspi_probe(struct platform_device *pdev)
895895
qspi->mmap_enabled = false;
896896
qspi->current_cs = -1;
897897

898-
ret = devm_spi_register_controller(&pdev->dev, host);
898+
ret = spi_register_controller(host);
899899
if (!ret)
900900
return 0;
901901

@@ -910,19 +910,17 @@ static int ti_qspi_probe(struct platform_device *pdev)
910910
static void ti_qspi_remove(struct platform_device *pdev)
911911
{
912912
struct ti_qspi *qspi = platform_get_drvdata(pdev);
913-
int rc;
914913

915-
rc = spi_controller_suspend(qspi->host);
916-
if (rc) {
917-
dev_alert(&pdev->dev, "spi_controller_suspend() failed (%pe)\n",
918-
ERR_PTR(rc));
919-
return;
920-
}
914+
spi_controller_get(qspi->host);
915+
916+
spi_unregister_controller(qspi->host);
921917

922918
pm_runtime_put_sync(&pdev->dev);
923919
pm_runtime_disable(&pdev->dev);
924920

925921
ti_qspi_dma_cleanup(qspi);
922+
923+
spi_controller_put(qspi->host);
926924
}
927925

928926
static const struct dev_pm_ops ti_qspi_pm_ops = {

0 commit comments

Comments
 (0)