From 0de107b34cd493f4406705a7a9f4a27476db9ed1 Mon Sep 17 00:00:00 2001
From: Peter Chen <peter.chen@freescale.com>
Date: Tue, 15 Nov 2011 21:52:29 +0100
Subject: [PATCH] --- yaml --- r: 275625 b: refs/heads/master c:
 af8db1508f2c9f3b6e633e2d2d906c6557c617f9 h: refs/heads/master i:   275623:
 888e64df7e088ca169fbf72964d425444e52ac7e v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/base/core.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 72d59e6fb349..996c129a5bb5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c81f90588972b8631bda4d538ffd0199a3e1b41
+refs/heads/master: af8db1508f2c9f3b6e633e2d2d906c6557c617f9
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
index 82c865452c70..d8b3d89db043 100644
--- a/trunk/drivers/base/core.c
+++ b/trunk/drivers/base/core.c
@@ -22,6 +22,7 @@
 #include <linux/kallsyms.h>
 #include <linux/mutex.h>
 #include <linux/async.h>
+#include <linux/pm_runtime.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);
+		/* Disable all device's runtime power management */
+		pm_runtime_disable(dev);
 
 		if (dev->bus && dev->bus->shutdown) {
 			dev_dbg(dev, "shutdown\n");