Merge branch 'pm-domains' into pm-opp
This commit is contained in:
commit
ca695496fe
|
@ -98,15 +98,15 @@ EXPORT_SYMBOL_GPL(dev_pm_put_subsys_data);
|
||||||
* Callers must ensure proper synchronization of this function with power
|
* Callers must ensure proper synchronization of this function with power
|
||||||
* management callbacks.
|
* management callbacks.
|
||||||
*
|
*
|
||||||
* Returns 0 on successfully attached PM domain and when it found that the
|
* Returns 0 on successfully attached PM domain, or when it is found that the
|
||||||
* device don't need a PM domain, else a negative error code.
|
* device doesn't need a PM domain, else a negative error code.
|
||||||
*/
|
*/
|
||||||
int dev_pm_domain_attach(struct device *dev, bool power_on)
|
int dev_pm_domain_attach(struct device *dev, bool power_on)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (dev->pm_domain)
|
if (dev->pm_domain)
|
||||||
return -EEXIST;
|
return 0;
|
||||||
|
|
||||||
ret = acpi_dev_pm_attach(dev, power_on);
|
ret = acpi_dev_pm_attach(dev, power_on);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
|
|
Loading…
Reference in New Issue