diff options
| author | Jeffy Chen <jeffy.chen@rock-chips.com> | 2017-08-07 15:40:19 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-08-07 18:44:10 +0300 |
| commit | 6a06e895b262621a81b3b08126b4bc5e1b8eef05 (patch) | |
| tree | 37dbfd044624568eb6c630a5cfb0d33d04841005 /drivers/spi/spi-rockchip.c | |
| parent | 43de979ddc099c57858b243619c66e2f663a2f97 (diff) | |
| download | linux-6a06e895b262621a81b3b08126b4bc5e1b8eef05.tar.xz | |
spi: rockchip: Fix clock handling in remove
We are assuming clocks enabled when calling rockchip_spi_remove, which
is not always true. Those clocks might already been disabled by the
runtime PM at that time.
Call pm_runtime_get_sync before trying to disable clocks to avoid that.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-rockchip.c')
| -rw-r--r-- | drivers/spi/spi-rockchip.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index 5497650992c7..a75fd9bb76de 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -816,11 +816,15 @@ static int rockchip_spi_remove(struct platform_device *pdev) struct spi_master *master = spi_master_get(platform_get_drvdata(pdev)); struct rockchip_spi *rs = spi_master_get_devdata(master); - pm_runtime_disable(&pdev->dev); + pm_runtime_get_sync(&pdev->dev); clk_disable_unprepare(rs->spiclk); clk_disable_unprepare(rs->apb_pclk); + pm_runtime_put_noidle(&pdev->dev); + pm_runtime_disable(&pdev->dev); + pm_runtime_set_suspended(&pdev->dev); + if (rs->dma_tx.ch) dma_release_channel(rs->dma_tx.ch); if (rs->dma_rx.ch) |