Skip to content

Commit 0ea46b0

Browse files
jhovoldgregkh
authored andcommitted
spi: zynqmp-gqspi: fix controller deregistration
commit 6895fc4 upstream. Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: dfe11a1 ("spi: Add support for Zynq Ultrascale+ MPSoC GQSPI controller") Cc: stable@vger.kernel.org # 4.2: 64640f6 Cc: stable@vger.kernel.org # 4.2 Cc: Ranjit Waghmode <ranjit.waghmode@xilinx.com> Signed-off-by: Johan Hovold <johan@kernel.org> Link: https://patch.msgid.link/20260410081757.503099-26-johan@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent a786ce0 commit 0ea46b0

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/spi/spi-zynqmp-gqspi.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1334,7 +1334,7 @@ static int zynqmp_qspi_probe(struct platform_device *pdev)
13341334
ctlr->dev.of_node = np;
13351335
ctlr->auto_runtime_pm = true;
13361336

1337-
ret = devm_spi_register_controller(&pdev->dev, ctlr);
1337+
ret = spi_register_controller(ctlr);
13381338
if (ret) {
13391339
dev_err(&pdev->dev, "spi_register_controller failed\n");
13401340
goto clk_dis_all;
@@ -1373,6 +1373,8 @@ static void zynqmp_qspi_remove(struct platform_device *pdev)
13731373

13741374
pm_runtime_get_sync(&pdev->dev);
13751375

1376+
spi_unregister_controller(xqspi->ctlr);
1377+
13761378
zynqmp_gqspi_write(xqspi, GQSPI_EN_OFST, 0x0);
13771379

13781380
pm_runtime_disable(&pdev->dev);

0 commit comments

Comments
 (0)