diff options
| author | Tobias Jordan <Tobias.Jordan@elektrobit.com> | 2017-12-07 15:04:53 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-19 09:09:57 +0100 |
| commit | fd92108e897018ae2c946d06c0bc86fbdc00664d (patch) | |
| tree | 7ddd71f6e015cb7e8351915d6470096767775f58 /drivers | |
| parent | fedc177b4267a12896b689f10adbc3bad0ebb05b (diff) | |
| download | linux-stable-fd92108e897018ae2c946d06c0bc86fbdc00664d.tar.gz linux-stable-fd92108e897018ae2c946d06c0bc86fbdc00664d.tar.bz2 linux-stable-fd92108e897018ae2c946d06c0bc86fbdc00664d.zip | |
spi: sun6i: disable/unprepare clocks on remove
[ Upstream commit 2d9bbd02c54094ceffa555143b0d68cd06504d63 ]
sun6i_spi_probe() uses sun6i_spi_runtime_resume() to prepare/enable
clocks, so sun6i_spi_remove() should use sun6i_spi_runtime_suspend() to
disable/unprepare them if we're not suspended.
Replacing pm_runtime_disable() by pm_runtime_force_suspend() will ensure
that sun6i_spi_runtime_suspend() is called if needed.
Found by Linux Driver Verification project (linuxtesting.org).
Fixes: 3558fe900e8af (spi: sunxi: Add Allwinner A31 SPI controller driver)
Signed-off-by: Tobias Jordan <Tobias.Jordan@elektrobit.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/spi-sun6i.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-sun6i.c b/drivers/spi/spi-sun6i.c index fb38234249a8..8533f4edd00a 100644 --- a/drivers/spi/spi-sun6i.c +++ b/drivers/spi/spi-sun6i.c @@ -541,7 +541,7 @@ err_free_master: static int sun6i_spi_remove(struct platform_device *pdev) { - pm_runtime_disable(&pdev->dev); + pm_runtime_force_suspend(&pdev->dev); return 0; } |