diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-27 19:54:22 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-27 19:54:22 -0400 |
| commit | 0acaab5367a2c4140bd965a0ad3ea265af4d43ed (patch) | |
| tree | 944fc8279a28c94e136325ec337ebe216a129ec1 /drivers/base/power/main.c | |
| parent | c940c8ce1db3ed3909d31c02aef01a864565519c (diff) | |
| parent | 841670351e8e5acbe9f7367f7df661a5d0cfef79 (diff) | |
Merge branch 'pm-runtime'
* pm-runtime:
PM / Runtime: Improve prepare handling at system suspend for genpd
PM / Runtime: Asyncronous idle|suspend parent devices at removal
PM / Runtime: Asyncronous idle|suspend devices at system resume
Diffstat (limited to 'drivers/base/power/main.c')
| -rw-r--r-- | drivers/base/power/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 15beb500a4e4..5a9b6569dd74 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c | |||
| @@ -756,7 +756,7 @@ static void device_complete(struct device *dev, pm_message_t state) | |||
| 756 | 756 | ||
| 757 | device_unlock(dev); | 757 | device_unlock(dev); |
| 758 | 758 | ||
| 759 | pm_runtime_put_sync(dev); | 759 | pm_runtime_put(dev); |
| 760 | } | 760 | } |
| 761 | 761 | ||
| 762 | /** | 762 | /** |