On Tuesday, September 09, 2014 01:33:57 PM Fu, Zhonghui wrote:
> From de3dfa34bd7f219586057a1e0679f9e7515fa722 Mon Sep 17 00:00:00 2001
> From: Fu Zhonghui <zhonghui.fu@xxxxxxxxxxxxxxx>
> Date: Tue, 9 Sep 2014 10:54:30 +0800
> Subject: [PATCH] ACPI / LPSS: complete PM entries for LPSS power domain
>
> PM entries of LPSS power domain were not implemented correctly
> in the patch "ACPI / LPSS: custom power domain for LPSS"
> commit ID c78b0830667a7e7c1f0ca65b76b33166a84806b3.
> This patch fixes and completes these PM entries.
>
> Signed-off-by: Li Aubrey <aubrey.li@xxxxxxxxxxxxxxx>
> Signed-off-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
> Signed-off-by: Fu Zhonghui <zhonghui.fu@xxxxxxxxxxxxxxx>
Queued up for 3.17-rc5, thanks!
> ---
> drivers/acpi/acpi_lpss.c | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
> index 9dfec48..fddc1e8 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)
> return acpi_dev_suspend_late(dev);
> }
>
> -static int acpi_lpss_restore_early(struct device *dev)
> +static int acpi_lpss_resume_early(struct device *dev)
> {
> int ret = acpi_dev_resume_early(dev);
>
> @@ -650,15 +650,15 @@ static int acpi_lpss_runtime_resume(struct device *dev)
> static struct dev_pm_domain acpi_lpss_pm_domain = {
> .ops = {
> #ifdef CONFIG_PM_SLEEP
> - .suspend_late = acpi_lpss_suspend_late,
> - .restore_early = acpi_lpss_restore_early,
> .prepare = acpi_subsys_prepare,
> .complete = acpi_subsys_complete,
> .suspend = acpi_subsys_suspend,
> - .resume_early = acpi_subsys_resume_early,
> + .suspend_late = acpi_lpss_suspend_late,
> + .resume_early = acpi_lpss_resume_early,
> .freeze = acpi_subsys_freeze,
> .poweroff = acpi_subsys_suspend,
> - .poweroff_late = acpi_subsys_suspend_late,
> + .poweroff_late = acpi_lpss_suspend_late,
> + .restore_early = acpi_lpss_resume_early,
> #endif
> #ifdef CONFIG_PM_RUNTIME
> .runtime_suspend = acpi_lpss_runtime_suspend,
> -- 1.7.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
