summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-11-19 04:06:49 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-11-19 04:06:49 +0400
commit77aa26514a3858cabce748fa093d871b5a51d269 (patch)
tree6625ffc28c4d1eef7f69818964f4e484e92fd3f2 /drivers/base
parent6431b430973c1c6eb2597da1533764cb4f696526 (diff)
parentaa1b9f13b3346352455bfdc343ecff7667b84ff5 (diff)
downloadlinux-77aa26514a3858cabce748fa093d871b5a51d269.tar.xz
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.c3
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)
device_unlock(dev);
+ if (error)
+ pm_runtime_put(dev);
+
return error;
}