aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpi_lpss.c
diff options
context:
space:
mode:
authorFu Zhonghui <zhonghui.fu@linux.intel.com>2014-09-09 10:30:06 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-09-09 10:30:06 -0400
commitf4168b617ac09986c4333accaff5d8ba5a9db7bf (patch)
tree0c890a89366162b083a68c47f6bd28b329549c00 /drivers/acpi/acpi_lpss.c
parent2ce7598c9a453e0acd0e07be7be3f5eb39608ebd (diff)
ACPI / LPSS: complete PM entries for LPSS power domain
PM entries of LPSS power domain were not implemented correctly in commit c78b0830667a "ACPI / LPSS: custom power domain for LPSS". This patch fixes and completes these PM entries. Fixes: c78b0830667a (ACPI / LPSS: custom power domain for LPSS) Signed-off-by: Li Aubrey <aubrey.li@linux.intel.com> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Fu Zhonghui <zhonghui.fu@linux.intel.com> Cc: 3.16+ <stable@vger.kernel.org> # 3.16+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpi_lpss.c')
-rw-r--r--drivers/acpi/acpi_lpss.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 9dfec48dd4e5..fddc1e86f9d0 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -610,7 +610,7 @@ static int acpi_lpss_suspend_late(struct device *dev)
610 return acpi_dev_suspend_late(dev); 610 return acpi_dev_suspend_late(dev);
611} 611}
612 612
613static int acpi_lpss_restore_early(struct device *dev) 613static int acpi_lpss_resume_early(struct device *dev)
614{ 614{
615 int ret = acpi_dev_resume_early(dev); 615 int ret = acpi_dev_resume_early(dev);
616 616
@@ -650,15 +650,15 @@ static int acpi_lpss_runtime_resume(struct device *dev)
650static struct dev_pm_domain acpi_lpss_pm_domain = { 650static struct dev_pm_domain acpi_lpss_pm_domain = {
651 .ops = { 651 .ops = {
652#ifdef CONFIG_PM_SLEEP 652#ifdef CONFIG_PM_SLEEP
653 .suspend_late = acpi_lpss_suspend_late,
654 .restore_early = acpi_lpss_restore_early,
655 .prepare = acpi_subsys_prepare, 653 .prepare = acpi_subsys_prepare,
656 .complete = acpi_subsys_complete, 654 .complete = acpi_subsys_complete,
657 .suspend = acpi_subsys_suspend, 655 .suspend = acpi_subsys_suspend,
658 .resume_early = acpi_subsys_resume_early, 656 .suspend_late = acpi_lpss_suspend_late,
657 .resume_early = acpi_lpss_resume_early,
659 .freeze = acpi_subsys_freeze, 658 .freeze = acpi_subsys_freeze,
660 .poweroff = acpi_subsys_suspend, 659 .poweroff = acpi_subsys_suspend,
661 .poweroff_late = acpi_subsys_suspend_late, 660 .poweroff_late = acpi_lpss_suspend_late,
661 .restore_early = acpi_lpss_resume_early,
662#endif 662#endif
663#ifdef CONFIG_PM_RUNTIME 663#ifdef CONFIG_PM_RUNTIME
664 .runtime_suspend = acpi_lpss_runtime_suspend, 664 .runtime_suspend = acpi_lpss_runtime_suspend,