tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

spi: dln2: fix controller deregistration

Make sure to deregister the controller before disabling it to allow
SPI device drivers to do I/O during deregistration.

Fixes: 3d8c0d749da3 ("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>

authored by

Johan Hovold and committed by
Mark Brown c353020f e7c510e1

+7 -1
+7 -1
drivers/spi/spi-dln2.c
··· 758 758 pm_runtime_set_active(&pdev->dev); 759 759 pm_runtime_enable(&pdev->dev); 760 760 761 - ret = devm_spi_register_controller(&pdev->dev, host); 761 + ret = spi_register_controller(host); 762 762 if (ret < 0) { 763 763 dev_err(&pdev->dev, "Failed to register host\n"); 764 764 goto exit_register; ··· 783 783 struct spi_controller *host = platform_get_drvdata(pdev); 784 784 struct dln2_spi *dln2 = spi_controller_get_devdata(host); 785 785 786 + spi_controller_get(host); 787 + 788 + spi_unregister_controller(host); 789 + 786 790 pm_runtime_disable(&pdev->dev); 787 791 788 792 if (dln2_spi_enable(dln2, false) < 0) 789 793 dev_err(&pdev->dev, "Failed to disable SPI module\n"); 794 + 795 + spi_controller_put(host); 790 796 } 791 797 792 798 #ifdef CONFIG_PM_SLEEP