mirror of
https://github.com/torvalds/linux.git
synced 2026-05-12 16:18:45 +02:00
spi: bcmbca-hsspi: fix controller deregistration
Make sure to deregister the controller before disabling underlying resources like interrupts during driver unbind to allow SPI drivers to do I/O during deregistration. Note that clocks were also disabled before the recent commite532e21a24("spi: bcm63xx-hsspi: Simplify clock handling with devm_clk_get_enabled()"). Fixes:a38a2233f2("spi: bcmbca-hsspi: Add driver for newer HSSPI controller") Cc: stable@vger.kernel.org # 6.3:deb269e039Cc: stable@vger.kernel.org # 6.3 Cc: William Zhang <william.zhang@broadcom.com> Signed-off-by: Johan Hovold <johan@kernel.org> Link: https://patch.msgid.link/20260409120419.388546-8-johan@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
ab837c5189
commit
c3d97c3320
|
|
@ -538,7 +538,7 @@ static int bcmbca_hsspi_probe(struct platform_device *pdev)
|
|||
return dev_err_probe(dev, ret, "couldn't register sysfs group\n");
|
||||
|
||||
/* register and we are done */
|
||||
ret = devm_spi_register_controller(dev, host);
|
||||
ret = spi_register_controller(host);
|
||||
if (ret)
|
||||
goto out_sysgroup_disable;
|
||||
|
||||
|
|
@ -556,6 +556,8 @@ static void bcmbca_hsspi_remove(struct platform_device *pdev)
|
|||
struct spi_controller *host = platform_get_drvdata(pdev);
|
||||
struct bcmbca_hsspi *bs = spi_controller_get_devdata(host);
|
||||
|
||||
spi_unregister_controller(host);
|
||||
|
||||
/* reset the hardware and block queue progress */
|
||||
__raw_writel(0, bs->regs + HSSPI_INT_MASK_REG);
|
||||
sysfs_remove_group(&pdev->dev.kobj, &bcmbca_hsspi_group);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user