summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-11-07 22:27:37 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-11-07 22:27:37 +0400
commit679d9980f9914136f6e488d976eb412de156c542 (patch)
tree8f9507f3465c12f12e3cdcddcdcab6b2c3f0479a /drivers/base
parentfeba070dbac6f7b477570e590a7dc960b7b0f784 (diff)
parentbaab52ded242c35a2290e1fa82e0cc147d0d8c1a (diff)
downloadlinux-679d9980f9914136f6e488d976eb412de156c542.tar.xz
Merge branch 'pm-runtime'
* pm-runtime: PM / runtime: Use pm_runtime_put_sync() in __device_release_driver()
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/dd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 35fa36898916..06051767393f 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);