diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 19:27:37 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 19:27:37 +0100 |
commit | 679d9980f9914136f6e488d976eb412de156c542 (patch) | |
tree | 8f9507f3465c12f12e3cdcddcdcab6b2c3f0479a | |
parent | feba070dbac6f7b477570e590a7dc960b7b0f784 (diff) | |
parent | baab52ded242c35a2290e1fa82e0cc147d0d8c1a (diff) | |
download | op-kernel-dev-679d9980f9914136f6e488d976eb412de156c542.zip op-kernel-dev-679d9980f9914136f6e488d976eb412de156c542.tar.gz |
Merge branch 'pm-runtime'
* pm-runtime:
PM / runtime: Use pm_runtime_put_sync() in __device_release_driver()
-rw-r--r-- | drivers/base/dd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 35fa368..0605176 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -499,7 +499,7 @@ static void __device_release_driver(struct device *dev) BUS_NOTIFY_UNBIND_DRIVER, dev); - pm_runtime_put(dev); + pm_runtime_put_sync(dev); if (dev->bus && dev->bus->remove) dev->bus->remove(dev); |