projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[cascardo/linux.git]
/
drivers
/
spi
/
spi-qup.c
diff --git
a/drivers/spi/spi-qup.c
b/drivers/spi/spi-qup.c
index
7f15556
..
1bfa889
100644
(file)
--- a/
drivers/spi/spi-qup.c
+++ b/
drivers/spi/spi-qup.c
@@
-982,8
+982,10
@@
static int spi_qup_suspend(struct device *device)
if (ret)
return ret;
- clk_disable_unprepare(controller->cclk);
- clk_disable_unprepare(controller->iclk);
+ if (!pm_runtime_suspended(device)) {
+ clk_disable_unprepare(controller->cclk);
+ clk_disable_unprepare(controller->iclk);
+ }
return 0;
}