diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-07-21 17:26:07 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:46:51 -0800 |
| commit | 9ca84c0c18f9e0435b8e7bd241a2662484165271 (patch) | |
| tree | bcc17a5976978a7a4e1df0eb2a1a83ac9dc4b200 /arch/arm/mach-tegra/cpuidle.c | |
| parent | f16ace672ec41b4abcf605c3be4cf0dbdc235acb (diff) | |
ARM: tegra: Prevent LP2 if request is less than target residency
Change-Id: Icc7409b611439ba94ec504579c00ab9227c9a857
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Rebase-Id: R4b56e98c821627de480a67c241363608ebfc2f07
Diffstat (limited to 'arch/arm/mach-tegra/cpuidle.c')
| -rw-r--r-- | arch/arm/mach-tegra/cpuidle.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/cpuidle.c b/arch/arm/mach-tegra/cpuidle.c index d1061fb850ef..712ac003224f 100644 --- a/arch/arm/mach-tegra/cpuidle.c +++ b/arch/arm/mach-tegra/cpuidle.c @@ -99,7 +99,8 @@ static int tegra_idle_enter_lp2(struct cpuidle_device *dev, ktime_t enter, exit; s64 us; - if (!lp2_in_idle || lp2_disabled_by_suspend) + if (!lp2_in_idle || lp2_disabled_by_suspend || + !tegra_lp2_is_allowed(dev, state)) return tegra_idle_enter_lp3(dev, state); local_irq_disable(); |