summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-05-30 13:51:01 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-05-30 13:51:01 +0200
commitca695496fe8d9eb62f89f417365516c31e46edf7 (patch)
tree012addc4b20e2842e3e1b101660734f27a095404 /drivers/base
parentPM / domains: Add perf_state attribute to genpd debugfs (diff)
parentPM / domains: Improve wording of dev_pm_domain_attach() comment (diff)
downloadlinux-ca695496fe8d9eb62f89f417365516c31e46edf7.tar.xz
linux-ca695496fe8d9eb62f89f417365516c31e46edf7.zip
Merge branch 'pm-domains' into pm-opp
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/power/common.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/base/power/common.c b/drivers/base/power/common.c
index 5e4b481595bd..7ae62b6355b8 100644
--- a/drivers/base/power/common.c
+++ b/drivers/base/power/common.c
@@ -98,15 +98,15 @@ EXPORT_SYMBOL_GPL(dev_pm_put_subsys_data);
* Callers must ensure proper synchronization of this function with power
* management callbacks.
*
- * Returns 0 on successfully attached PM domain and when it found that the
- * device don't need a PM domain, else a negative error code.
+ * Returns 0 on successfully attached PM domain, or when it is found that the
+ * device doesn't need a PM domain, else a negative error code.
*/
int dev_pm_domain_attach(struct device *dev, bool power_on)
{
int ret;
if (dev->pm_domain)
- return -EEXIST;
+ return 0;
ret = acpi_dev_pm_attach(dev, power_on);
if (!ret)