diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-21 00:42:59 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-21 00:42:59 +0100 |
| commit | 6efd3f8cde1d6acc20a715ac6ea17e01421742df (patch) | |
| tree | 5fc4caece6907a2ccdeb8b13b887a01d683d9803 /drivers/base/platform.c | |
| parent | a72aea722f1b43442c9e219de824d5975dcdaa61 (diff) | |
| parent | 3ded91041a762423bd49bb932ae2e36b65c6ae4b (diff) | |
| download | linux-6efd3f8cde1d6acc20a715ac6ea17e01421742df.tar.gz | |
Merge branch 'pm-core'
* pm-core:
driver core: Avoid NULL pointer dereferences in device_is_bound()
platform: Do not detach from PM domains on shutdown
USB / PM: Allow USB devices to remain runtime-suspended when sleeping
PM / sleep: Go direct_complete if driver has no callbacks
PM / Domains: add setter for dev.pm_domain
device core: add device_is_bound()
Diffstat (limited to 'drivers/base/platform.c')
| -rw-r--r-- | drivers/base/platform.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 8dcbb266643b8..73d6e5d39e33e 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -597,7 +597,6 @@ static void platform_drv_shutdown(struct device *_dev) if (drv->shutdown) drv->shutdown(dev); - dev_pm_domain_detach(_dev, true); } /** |