summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorChuhong Yuan <hslester96@gmail.com>2019-11-18 10:48:48 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-31 16:36:06 +0100
commitc6b41a403bd1072099ff50087b4b28b4bf26b7f2 (patch)
treea6ffbd288e5ecad8d8b5a7762acd884bb124b416 /drivers/spi
parentf3897dc04734a30479e366f9979a90d979b9481c (diff)
downloadlinux-stable-c6b41a403bd1072099ff50087b4b28b4bf26b7f2.tar.gz
linux-stable-c6b41a403bd1072099ff50087b4b28b4bf26b7f2.tar.bz2
linux-stable-c6b41a403bd1072099ff50087b4b28b4bf26b7f2.zip
spi: st-ssc4: add missed pm_runtime_disable
[ Upstream commit cd050abeba2a95fe5374eec28ad2244617bcbab6 ] The driver forgets to call pm_runtime_disable in probe failure and remove. Add the missed calls to fix it. Signed-off-by: Chuhong Yuan <hslester96@gmail.com> Link: https://lore.kernel.org/r/20191118024848.21645-1-hslester96@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-st-ssc4.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/spi/spi-st-ssc4.c b/drivers/spi/spi-st-ssc4.c
index a4e43fc19ece..5df01ffdef46 100644
--- a/drivers/spi/spi-st-ssc4.c
+++ b/drivers/spi/spi-st-ssc4.c
@@ -385,6 +385,7 @@ static int spi_st_probe(struct platform_device *pdev)
return 0;
clk_disable:
+ pm_runtime_disable(&pdev->dev);
clk_disable_unprepare(spi_st->clk);
put_master:
spi_master_put(master);
@@ -396,6 +397,8 @@ static int spi_st_remove(struct platform_device *pdev)
struct spi_master *master = platform_get_drvdata(pdev);
struct spi_st *spi_st = spi_master_get_devdata(master);
+ pm_runtime_disable(&pdev->dev);
+
clk_disable_unprepare(spi_st->clk);
pinctrl_pm_select_sleep_state(&pdev->dev);