projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f3897dc
)
spi: st-ssc4: add missed pm_runtime_disable
author
Chuhong Yuan
<hslester96@gmail.com>
Mon, 18 Nov 2019 02:48:48 +0000
(10:48 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Tue, 31 Dec 2019 15:36:06 +0000
(16:36 +0100)
[ 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>
drivers/spi/spi-st-ssc4.c
patch
|
blob
|
history
diff --git
a/drivers/spi/spi-st-ssc4.c
b/drivers/spi/spi-st-ssc4.c
index
a4e43fc
..
5df01ff
100644
(file)
--- 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);