summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-tegra/pm.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c
index f74c159262cd..450c5e17c2d2 100644
--- a/arch/arm/mach-tegra/pm.c
+++ b/arch/arm/mach-tegra/pm.c
@@ -980,7 +980,8 @@ static ssize_t suspend_mode_store(struct kobject *kobj,
if (!len)
goto bad_name;
/* TEGRA_SUSPEND_NONE not allowed as suspend state */
- if (!(strncmp(buf, tegra_suspend_name[TEGRA_SUSPEND_NONE], len))) {
+ if (!(strncmp(buf, tegra_suspend_name[TEGRA_SUSPEND_NONE], len))
+ || !(strncmp(buf, tegra_suspend_name[TEGRA_SUSPEND_LP2], len))) {
pr_info("Illegal tegra suspend state: %s\n", buf);
goto bad_name;
}
@@ -1046,6 +1047,9 @@ void __init tegra_init_suspend(struct tegra_suspend_platform_data *plat)
(void)reg;
(void)mode;
+ if (plat->suspend_mode == TEGRA_SUSPEND_LP2)
+ plat->suspend_mode = TEGRA_SUSPEND_LP0;
+
#ifndef CONFIG_PM_SLEEP
if (plat->suspend_mode != TEGRA_SUSPEND_NONE) {
pr_warning("%s: Suspend requires CONFIG_PM_SLEEP -- "