Skip to content

Commit c3713f8

Browse files
jhovoldgregkh
authored andcommitted
spi: dln2: fix controller deregistration
commit c353020 upstream. Make sure to deregister the controller before disabling it to allow SPI device drivers to do I/O during deregistration. Fixes: 3d8c0d7 ("spi: add support for DLN-2 USB-SPI adapter") Cc: stable@vger.kernel.org # 4.0 Cc: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Johan Hovold <johan@kernel.org> Link: https://patch.msgid.link/20260409120419.388546-12-johan@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent b80231f commit c3713f8

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

drivers/spi/spi-dln2.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ static int dln2_spi_probe(struct platform_device *pdev)
761761
pm_runtime_set_active(&pdev->dev);
762762
pm_runtime_enable(&pdev->dev);
763763

764-
ret = devm_spi_register_controller(&pdev->dev, host);
764+
ret = spi_register_controller(host);
765765
if (ret < 0) {
766766
dev_err(&pdev->dev, "Failed to register host\n");
767767
goto exit_register;
@@ -786,10 +786,16 @@ static void dln2_spi_remove(struct platform_device *pdev)
786786
struct spi_controller *host = platform_get_drvdata(pdev);
787787
struct dln2_spi *dln2 = spi_controller_get_devdata(host);
788788

789+
spi_controller_get(host);
790+
791+
spi_unregister_controller(host);
792+
789793
pm_runtime_disable(&pdev->dev);
790794

791795
if (dln2_spi_enable(dln2, false) < 0)
792796
dev_err(&pdev->dev, "Failed to disable SPI module\n");
797+
798+
spi_controller_put(host);
793799
}
794800

795801
#ifdef CONFIG_PM_SLEEP

0 commit comments

Comments
 (0)