| From foo@baz Fri Mar 16 15:43:17 CET 2018 |
| From: Tobias Jordan <Tobias.Jordan@elektrobit.com> |
| Date: Thu, 7 Dec 2017 15:04:53 +0100 |
| Subject: spi: sun6i: disable/unprepare clocks on remove |
| |
| From: Tobias Jordan <Tobias.Jordan@elektrobit.com> |
| |
| |
| [ 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> |
| --- |
| drivers/spi/spi-sun6i.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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; |
| } |
