summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2017-08-11 15:44:43 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-28 18:02:46 +0200
commit7521621e600aeefe5ffcc1f90ae26a42fc20c452 (patch)
tree9aa634ae98e149c28f4e301f06b9352b0a74ac1a /drivers/base
parentdf44d30d28cb7dd4f3dc105d843a4a01f5dfc860 (diff)
downloadlinux-stable-7521621e600aeefe5ffcc1f90ae26a42fc20c452.tar.gz
linux-stable-7521621e600aeefe5ffcc1f90ae26a42fc20c452.tar.bz2
linux-stable-7521621e600aeefe5ffcc1f90ae26a42fc20c452.zip
Do not disable driver and bus shutdown hook when class shutdown hook is set.
As seen from the implementation of the single class shutdown hook this is not very sound design. Rename the class shutdown hook to shutdown_pre to make it clear it runs before the driver shutdown hook. Signed-off-by: Michal Suchanek <msuchanek@suse.de> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/core.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index cb4b5b1f1b09..12ebd055724c 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -2796,11 +2796,12 @@ void device_shutdown(void)
pm_runtime_get_noresume(dev);
pm_runtime_barrier(dev);
- if (dev->class && dev->class->shutdown) {
+ if (dev->class && dev->class->shutdown_pre) {
if (initcall_debug)
- dev_info(dev, "shutdown\n");
- dev->class->shutdown(dev);
- } else if (dev->bus && dev->bus->shutdown) {
+ dev_info(dev, "shutdown_pre\n");
+ dev->class->shutdown_pre(dev);
+ }
+ if (dev->bus && dev->bus->shutdown) {
if (initcall_debug)
dev_info(dev, "shutdown\n");
dev->bus->shutdown(dev);