Merge branch 'pm-domains' into pm-opp

rafaeljw · rafaeljw · commit ca695496fe8d · 2018-05-30T13:51:01.000+02:00
diff --git 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)
