diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-18 19:06:49 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-18 19:06:49 -0500 |
| commit | 77aa26514a3858cabce748fa093d871b5a51d269 (patch) | |
| tree | 6625ffc28c4d1eef7f69818964f4e484e92fd3f2 /drivers/base | |
| parent | 6431b430973c1c6eb2597da1533764cb4f696526 (diff) | |
| parent | aa1b9f13b3346352455bfdc343ecff7667b84ff5 (diff) | |
Merge branch 'pm-runtime'
* pm-runtime:
PM / Runtime: Fix error path for prepare
PM / Runtime: Update documentation around probe|remove|suspend
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index ee039afe9078..2a1b06ae0bdc 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c | |||
| @@ -1350,6 +1350,9 @@ static int device_prepare(struct device *dev, pm_message_t state) | |||
| 1350 | 1350 | ||
| 1351 | device_unlock(dev); | 1351 | device_unlock(dev); |
| 1352 | 1352 | ||
| 1353 | if (error) | ||
| 1354 | pm_runtime_put(dev); | ||
| 1355 | |||
| 1353 | return error; | 1356 | return error; |
| 1354 | } | 1357 | } |
| 1355 | 1358 | ||