projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~keithp/linux
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
base
/
core.c
diff --git
a/drivers/base/core.c
b/drivers/base/core.c
index
d8b3d89
..
919daa7
100644
(file)
--- a/
drivers/base/core.c
+++ b/
drivers/base/core.c
@@
-1743,8
+1743,10
@@
void device_shutdown(void)
*/
list_del_init(&dev->kobj.entry);
spin_unlock(&devices_kset->list_lock);
*/
list_del_init(&dev->kobj.entry);
spin_unlock(&devices_kset->list_lock);
- /* Disable all device's runtime power management */
- pm_runtime_disable(dev);
+
+ /* Don't allow any more runtime suspends */
+ pm_runtime_get_noresume(dev);
+ pm_runtime_barrier(dev);
if (dev->bus && dev->bus->shutdown) {
dev_dbg(dev, "shutdown\n");
if (dev->bus && dev->bus->shutdown) {
dev_dbg(dev, "shutdown\n");