projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
base
/
core.c
diff --git
a/drivers/base/core.c
b/drivers/base/core.c
index 82c865452c7080d180ec6a453ab1efb3e988dac3..d8b3d89db043e7e9ead44cb8b4a00946f4980fa6 100644
(file)
--- a/
drivers/base/core.c
+++ b/
drivers/base/core.c
@@
-22,6
+22,7
@@
#include <linux/kallsyms.h>
#include <linux/mutex.h>
#include <linux/async.h>
#include <linux/kallsyms.h>
#include <linux/mutex.h>
#include <linux/async.h>
+#include <linux/pm_runtime.h>
#include "base.h"
#include "power/power.h"
#include "base.h"
#include "power/power.h"
@@
-1742,6
+1743,8
@@
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);
if (dev->bus && dev->bus->shutdown) {
dev_dbg(dev, "shutdown\n");
if (dev->bus && dev->bus->shutdown) {
dev_dbg(dev, "shutdown\n");