diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 13:27:37 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 13:27:37 -0500 |
| commit | 679d9980f9914136f6e488d976eb412de156c542 (patch) | |
| tree | 8f9507f3465c12f12e3cdcddcdcab6b2c3f0479a | |
| parent | feba070dbac6f7b477570e590a7dc960b7b0f784 (diff) | |
| parent | baab52ded242c35a2290e1fa82e0cc147d0d8c1a (diff) | |
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 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) | |||
| 499 | BUS_NOTIFY_UNBIND_DRIVER, | 499 | BUS_NOTIFY_UNBIND_DRIVER, |
| 500 | dev); | 500 | dev); |
| 501 | 501 | ||
| 502 | pm_runtime_put(dev); | 502 | pm_runtime_put_sync(dev); |
| 503 | 503 | ||
| 504 | if (dev->bus && dev->bus->remove) | 504 | if (dev->bus && dev->bus->remove) |
| 505 | dev->bus->remove(dev); | 505 | dev->bus->remove(dev); |