diff options
| author | Josh Zimmerman | 2017-06-25 23:53:23 +0200 |
|---|---|---|
| committer | James Morris | 2017-07-07 01:49:24 +0200 |
| commit | f77af15165847406b15d8f70c382c4cb15846b2a (patch) | |
| tree | 4941098b00f641bfe02658b9204f7cd00e05e52b /drivers/base/core.c | |
| parent | Cavium CNN55XX: fix broken default Kconfig entry (diff) | |
| download | kernel-qcow2-linux-f77af15165847406b15d8f70c382c4cb15846b2a.tar.gz kernel-qcow2-linux-f77af15165847406b15d8f70c382c4cb15846b2a.tar.xz kernel-qcow2-linux-f77af15165847406b15d8f70c382c4cb15846b2a.zip | |
Add "shutdown" to "struct class".
The TPM class has some common shutdown code that must be executed for
all drivers. This adds some needed functionality for that.
Signed-off-by: Josh Zimmerman <joshz@google.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: stable@vger.kernel.org
Fixes: 74d6b3ceaa17 ("tpm: fix suspend/resume paths for TPM 2.0")
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'drivers/base/core.c')
| -rw-r--r-- | drivers/base/core.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 8dde934f8d15..755451f684bc 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -2664,7 +2664,11 @@ void device_shutdown(void) pm_runtime_get_noresume(dev); pm_runtime_barrier(dev); - if (dev->bus && dev->bus->shutdown) { + if (dev->class && dev->class->shutdown) { + if (initcall_debug) + dev_info(dev, "shutdown\n"); + dev->class->shutdown(dev); + } else if (dev->bus && dev->bus->shutdown) { if (initcall_debug) dev_info(dev, "shutdown\n"); dev->bus->shutdown(dev); |