diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-05-30 07:51:01 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-05-30 07:51:01 -0400 |
| commit | ca695496fe8d9eb62f89f417365516c31e46edf7 (patch) | |
| tree | 012addc4b20e2842e3e1b101660734f27a095404 /drivers | |
| parent | e89128124c28cc9b74ce9e7a605b22dae031fe5d (diff) | |
| parent | 49072f97d4a3f8f44fe9677e3df94082b29b7e6f (diff) | |
Merge branch 'pm-domains' into pm-opp
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/power/common.c | 6 |
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); | |||
| 98 | * Callers must ensure proper synchronization of this function with power | 98 | * Callers must ensure proper synchronization of this function with power |
| 99 | * management callbacks. | 99 | * management callbacks. |
| 100 | * | 100 | * |
| 101 | * Returns 0 on successfully attached PM domain and when it found that the | 101 | * Returns 0 on successfully attached PM domain, or when it is found that the |
| 102 | * device don't need a PM domain, else a negative error code. | 102 | * device doesn't need a PM domain, else a negative error code. |
| 103 | */ | 103 | */ |
| 104 | int dev_pm_domain_attach(struct device *dev, bool power_on) | 104 | int dev_pm_domain_attach(struct device *dev, bool power_on) |
| 105 | { | 105 | { |
| 106 | int ret; | 106 | int ret; |
| 107 | 107 | ||
| 108 | if (dev->pm_domain) | 108 | if (dev->pm_domain) |
| 109 | return -EEXIST; | 109 | return 0; |
| 110 | 110 | ||
| 111 | ret = acpi_dev_pm_attach(dev, power_on); | 111 | ret = acpi_dev_pm_attach(dev, power_on); |
| 112 | if (!ret) | 112 | if (!ret) |