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: microchip-core-qspi: fix controller deregistration

Make sure to deregister the controller before disabling underlying
resources like interrupts during driver unbind.

Fixes: 8596124c4c1b ("spi: microchip-core-qspi: Add support for microchip fpga qspi controllers")
Cc: stable@vger.kernel.org # 6.1
Cc: Naga Sureshkumar Relli <nagasuresh.relli@microchip.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Acked-by: Conor Dooley <conor.dooley@microchip.com>
Link: https://patch.msgid.link/20260409120419.388546-19-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Johan Hovold and committed by
Mark Brown e6464140 77953c76

+8 -4
+8 -4
drivers/spi/spi-microchip-core-qspi.c
··· 692 692 return -ENOMEM; 693 693 694 694 qspi = spi_controller_get_devdata(ctlr); 695 - platform_set_drvdata(pdev, qspi); 695 + platform_set_drvdata(pdev, ctlr); 696 696 697 697 qspi->regs = devm_platform_ioremap_resource(pdev, 0); 698 698 if (IS_ERR(qspi->regs)) ··· 732 732 ctlr->num_chipselect = 2; 733 733 ctlr->use_gpio_descriptors = true; 734 734 735 - ret = devm_spi_register_controller(&pdev->dev, ctlr); 735 + ret = spi_register_controller(ctlr); 736 736 if (ret) 737 737 return dev_err_probe(&pdev->dev, ret, 738 738 "spi_register_controller failed\n"); ··· 742 742 743 743 static void mchp_coreqspi_remove(struct platform_device *pdev) 744 744 { 745 - struct mchp_coreqspi *qspi = platform_get_drvdata(pdev); 746 - u32 control = readl_relaxed(qspi->regs + REG_CONTROL); 745 + struct spi_controller *ctlr = platform_get_drvdata(pdev); 746 + struct mchp_coreqspi *qspi = spi_controller_get_devdata(ctlr); 747 + u32 control; 747 748 749 + spi_unregister_controller(ctlr); 750 + 751 + control = readl_relaxed(qspi->regs + REG_CONTROL); 748 752 mchp_coreqspi_disable_ints(qspi); 749 753 control &= ~CONTROL_ENABLE; 750 754 writel_relaxed(control, qspi->regs + REG_CONTROL);