summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2010-09-16 21:49:17 +0530
committerBharat Nihalani <bnihalani@nvidia.com>2010-09-30 22:51:12 -0700
commit7b58d6bfad87dc9b7ccbe1b1e953bf5d76908db2 (patch)
treee8d6197fd90d7e229cb90c13aa830c252dfb6aef /arch
parent7412861182283335445985f789cfa387c784590a (diff)
[arm/tegra] kbc: Keep enabling if wake key configured in suspend/resume.
Keep enabling the kc controller only if any of keys are configured as wakeup source during suspend. bug 735233 (cherry picked from commit 13825a46587b0508aa7a43054964b76524d5f2b6) Change-Id: I028965400ee4f96c1460f8e261a2376943384030 Reviewed-on: http://git-master/r/7499 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> Tested-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'arch')
-rwxr-xr-xarch/arm/mach-tegra/board-nvodm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-nvodm.c b/arch/arm/mach-tegra/board-nvodm.c
index bb3efa86bf20..029c432dba37 100755
--- a/arch/arm/mach-tegra/board-nvodm.c
+++ b/arch/arm/mach-tegra/board-nvodm.c
@@ -726,6 +726,7 @@ static noinline void __init tegra_setup_kbc(void)
pr_err("%s: out of memory for key mapping\n", __func__);
return;
}
+ pdata->wake_cnt = 0;
if (NvOdmKbcIsSelectKeysWkUpEnabled(&wake_row, &wake_col, &wake_num)) {
BUG_ON(!wake_num || wake_num>=KBC_MAX_KEY);
pdata->wake_cfg = kzalloc(sizeof(*pdata->wake_cfg)*wake_num,