diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-13 11:40:22 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-13 11:40:22 +0000 |
| commit | f891dfcd5fd0a0848ca42311e78eca8bf1d3e45b (patch) | |
| tree | a58be80eaa964310fef20fe87386ef7fe3381763 /drivers/acpi/device_pm.c | |
| parent | 7d8d2b5924c41ee249ee2280d4240d7cbba3fda8 (diff) | |
| parent | 3e5fe00cd38e033796a0de2ea9928c0cb460e6b6 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-v3.10-android-14.12
Diffstat (limited to 'drivers/acpi/device_pm.c')
| -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 553527c2532b..3e865d2c59e0 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c @@ -965,6 +965,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); |