From 3ac6e56c325e4660837efcf995e8460d917b4778 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 12 Jan 2021 14:09:17 +0100
Subject: [PATCH] Revert "drivers: core: Detach device from power domain on
 shutdown"

This reverts commit 0fab972eef49ef8d30eb91d6bd98861122d083d1 as it is
reported by users to cause problems.

Reported-by: Dmitry Osipenko <digetx@gmail.com>
Fixes: 0fab972eef49 ("drivers: core: Detach device from power domain on shutdown")
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Furquan Shaikh <furquan@google.com>
Link: https://lore.kernel.org/r/CAJZ5v0jhniqG43F6hCqXdxQiQZRc67GdkdP0BXcRut=P7k7BVQ@mail.gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/base/core.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 1ed9594..e61e62b6 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -23,7 +23,6 @@
 #include <linux/of_device.h>
 #include <linux/genhd.h>
 #include <linux/mutex.h>
-#include <linux/pm_domain.h>
 #include <linux/pm_runtime.h>
 #include <linux/netdevice.h>
 #include <linux/sched/signal.h>
@@ -4288,8 +4287,6 @@ void device_shutdown(void)
 			dev->driver->shutdown(dev);
 		}
 
-		dev_pm_domain_detach(dev, true);
-
 		device_unlock(dev);
 		if (parent)
 			device_unlock(parent);
-- 
2.7.4