Skip to content

Commit 2be3922

Browse files
jhovoldgregkh
authored andcommitted
spi: s3c64xx: fix controller deregistration
commit c1446b6 upstream. Make sure to deregister the controller before releasing underlying resources like DMA during driver unbind. Fixes: 91800f0 ("spi/s3c64xx: Use managed registration") Cc: stable@vger.kernel.org # 3.13: 76fbad4 Cc: stable@vger.kernel.org # 3.13 Signed-off-by: Johan Hovold <johan@kernel.org> Link: https://patch.msgid.link/20260410081757.503099-12-johan@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent b9d4b9c commit 2be3922

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/spi/spi-s3c64xx.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1305,7 +1305,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
13051305
S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN,
13061306
sdd->regs + S3C64XX_SPI_INT_EN);
13071307

1308-
ret = devm_spi_register_controller(&pdev->dev, host);
1308+
ret = spi_register_controller(host);
13091309
if (ret != 0) {
13101310
dev_err(&pdev->dev, "cannot register SPI host: %d\n", ret);
13111311
goto err_pm_put;
@@ -1336,6 +1336,8 @@ static void s3c64xx_spi_remove(struct platform_device *pdev)
13361336

13371337
pm_runtime_get_sync(&pdev->dev);
13381338

1339+
spi_unregister_controller(host);
1340+
13391341
writel(0, sdd->regs + S3C64XX_SPI_INT_EN);
13401342

13411343
pm_runtime_put_noidle(&pdev->dev);

0 commit comments

Comments
 (0)