Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'spi-fix-v6.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fix from Mark Brown:
"One fix for a runtime PM underflow when removing the Cadence QuadSPI
driver"
* tag 'spi-fix-v6.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
spi: spi-cadence-quadspi: Fix pm runtime unbalance
+7
-5
+7
-5
drivers/spi/spi-cadence-quadspi.c
+7
-5
drivers/spi/spi-cadence-quadspi.c
···
1958
1958
goto probe_setup_failed;
1959
1959
}
1960
1960
1961
-
ret = devm_pm_runtime_enable(dev);
1962
-
if (ret) {
1963
-
if (cqspi->rx_chan)
1964
-
dma_release_channel(cqspi->rx_chan);
1961
+
pm_runtime_enable(dev);
1962
+
1963
+
if (cqspi->rx_chan) {
1964
+
dma_release_channel(cqspi->rx_chan);
1965
1965
goto probe_setup_failed;
1966
1966
}
1967
1967
···
1981
1981
return 0;
1982
1982
probe_setup_failed:
1983
1983
cqspi_controller_enable(cqspi, 0);
1984
+
pm_runtime_disable(dev);
1984
1985
probe_reset_failed:
1985
1986
if (cqspi->is_jh7110)
1986
1987
cqspi_jh7110_disable_clk(pdev, cqspi);
···
2000
1999
if (cqspi->rx_chan)
2001
2000
dma_release_channel(cqspi->rx_chan);
2002
2001
2003
-
clk_disable_unprepare(cqspi->clk);
2002
+
if (pm_runtime_get_sync(&pdev->dev) >= 0)
2003
+
clk_disable(cqspi->clk);
2004
2004
2005
2005
if (cqspi->is_jh7110)
2006
2006
cqspi_jh7110_disable_clk(pdev, cqspi);