Skip to content

Commit 55be737

Browse files
jhovoldgregkh
authored andcommitted
spi: at91-usart: fix controller deregistration
commit 9acecc9 upstream. Make sure to deregister the controller before disabling and releasing underlying resources like clocks and DMA during driver unbind. Fixes: e189254 ("spi: at91-usart: Add driver for at91-usart as SPI") Cc: stable@vger.kernel.org # 4.20 Cc: Radu Pirea <radu.pirea@microchip.com> Signed-off-by: Johan Hovold <johan@kernel.org> Link: https://patch.msgid.link/20260409120419.388546-4-johan@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 70c2ee9 commit 55be737

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

drivers/spi/spi-at91-usart.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ static int at91_usart_spi_probe(struct platform_device *pdev)
570570
spin_lock_init(&aus->lock);
571571
init_completion(&aus->xfer_completion);
572572

573-
ret = devm_spi_register_controller(&pdev->dev, controller);
573+
ret = spi_register_controller(controller);
574574
if (ret)
575575
goto at91_usart_fail_register_controller;
576576

@@ -648,8 +648,14 @@ static void at91_usart_spi_remove(struct platform_device *pdev)
648648
struct spi_controller *ctlr = platform_get_drvdata(pdev);
649649
struct at91_usart_spi *aus = spi_controller_get_devdata(ctlr);
650650

651+
spi_controller_get(ctlr);
652+
653+
spi_unregister_controller(ctlr);
654+
651655
at91_usart_spi_release_dma(ctlr);
652656
clk_disable_unprepare(aus->clk);
657+
658+
spi_controller_put(ctlr);
653659
}
654660

655661
static const struct dev_pm_ops at91_usart_spi_pm_ops = {

0 commit comments

Comments
 (0)