diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-13 11:40:12 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-13 11:40:12 +0000 |
| commit | 84ef44fda92bbf2c1818f8a3781a3376f72947a6 (patch) | |
| tree | 0a187266ef43d3ca6aa3e384775be9a50d492b13 /drivers/acpi | |
| parent | c7da7ad00ab7ff435d83fe5c85cdb90851e94928 (diff) | |
| parent | 451186466690224e3c49e915bbcbcb04dae65b5b (diff) | |
Merge remote-tracking branch 'lsk/v3.14/topic/genpd' into linux-linaro-lsk-v3.14
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/device_pm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index c14a00d3dca6..fc75bdf8067e 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c @@ -987,6 +987,8 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on) acpi_dev_pm_full_power(adev); __acpi_device_run_wake(adev, false); } + + dev->pm_domain->detach = acpi_dev_pm_detach; return 0; } EXPORT_SYMBOL_GPL(acpi_dev_pm_attach); |