Skip to content

Commit 562d954

Browse files
jhovoldgregkh
authored andcommitted
spi: fsl: fix controller deregistration
commit 9b7abfe upstream. Make sure to deregister the controller before releasing underlying resources like DMA during driver unbind. Fixes: 4178b6b ("spi: fsl-(e)spi: migrate to using devm_ functions to simplify cleanup") Cc: stable@vger.kernel.org # 4.3 Cc: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: Johan Hovold <johan@kernel.org> Link: https://patch.msgid.link/20260410064749.496888-1-johan@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 59da4cd commit 562d954

1 file changed

Lines changed: 13 additions & 1 deletion

File tree

drivers/spi/spi-fsl-spi.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ static struct spi_controller *fsl_spi_probe(struct device *dev,
615615

616616
mpc8xxx_spi_write_reg(&reg_base->mode, regval);
617617

618-
ret = devm_spi_register_controller(dev, host);
618+
ret = spi_register_controller(host);
619619
if (ret < 0)
620620
goto err_probe;
621621

@@ -706,7 +706,13 @@ static void of_fsl_spi_remove(struct platform_device *ofdev)
706706
struct spi_controller *host = platform_get_drvdata(ofdev);
707707
struct mpc8xxx_spi *mpc8xxx_spi = spi_controller_get_devdata(host);
708708

709+
spi_controller_get(host);
710+
711+
spi_unregister_controller(host);
712+
709713
fsl_spi_cpm_free(mpc8xxx_spi);
714+
715+
spi_controller_put(host);
710716
}
711717

712718
static struct platform_driver of_fsl_spi_driver = {
@@ -752,7 +758,13 @@ static void plat_mpc8xxx_spi_remove(struct platform_device *pdev)
752758
struct spi_controller *host = platform_get_drvdata(pdev);
753759
struct mpc8xxx_spi *mpc8xxx_spi = spi_controller_get_devdata(host);
754760

761+
spi_controller_get(host);
762+
763+
spi_unregister_controller(host);
764+
755765
fsl_spi_cpm_free(mpc8xxx_spi);
766+
767+
spi_controller_put(host);
756768
}
757769

758770
MODULE_ALIAS("platform:mpc8xxx_spi");

0 commit comments

Comments
 (0)