summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Frid <afrid@nvidia.com>2010-10-04 19:53:37 -0700
committerYu-Huan Hsu <yhsu@nvidia.com>2010-10-07 11:13:27 -0700
commit73b3f1c4b0552d39e41abb50a3aaf3b778fefcc7 (patch)
tree08a0daa24436279448db891a15942f515e636c30
parent7e5b6efc908c372352f724499848957893422f0e (diff)
[ARM/tegra] power: Fixed assert in suspend init.
Set correct field offset in assert on CPU power request polarity during suspend initialization. Bug 741736 Change-Id: Ie7c6589b47b92af815151f6d95ae0acd3030c9cc Reviewed-on: http://git-master/r/7794 Reviewed-by: Hoang Pham <hopham@nvidia.com> Tested-by: Hoang Pham <hopham@nvidia.com> Reviewed-by: Harry Hong <hhong@nvidia.com> Tested-by: Harry Hong <hhong@nvidia.com> Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/suspend.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/suspend.c b/arch/arm/mach-tegra/suspend.c
index baa873bc0fc7..b38833211302 100644
--- a/arch/arm/mach-tegra/suspend.c
+++ b/arch/arm/mach-tegra/suspend.c
@@ -762,7 +762,7 @@ void __init tegra_init_suspend(struct tegra_suspend_platform_data *plat)
/* Always enable CPU power request; just normal polarity is supported */
reg = readl(pmc + PMC_CTRL);
- BUG_ON(reg & TEGRA_POWER_CPU_PWRREQ_POLARITY);
+ BUG_ON(reg & (TEGRA_POWER_CPU_PWRREQ_POLARITY << TEGRA_POWER_PMC_SHIFT));
reg |= (TEGRA_POWER_CPU_PWRREQ_OE << TEGRA_POWER_PMC_SHIFT);
pmc_32kwritel(reg, PMC_CTRL);