From 3f3eefc8ac980eb3fc71aea68f0572de696c5192 Mon Sep 17 00:00:00 2001 From: Gary King Date: Mon, 22 Feb 2010 11:24:30 -0800 Subject: keyboard: remove suspend/resume calls from tegra nvec driver occassionally, the keyboard stops functioning after the system resumes from suspend state; this may be due to a failure enabling keyboard scanning mode during suspend. disable suspend/resume calls from nvec keyboard driver until a solution for this problem is resolved (e.g., converting nvec to a bus). Change-Id: Id9f83a41852c8fec293bd43a94acaa287c184be0 --- drivers/input/keyboard/tegra-nvec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/input/keyboard/tegra-nvec.c b/drivers/input/keyboard/tegra-nvec.c index 8c6679994648..266a3a29cacf 100644 --- a/drivers/input/keyboard/tegra-nvec.c +++ b/drivers/input/keyboard/tegra-nvec.c @@ -369,6 +369,7 @@ static int __devinit nvec_keyboard_probe(struct platform_device *pdev) /* get EC handle */ nverr = NvEcOpen(&keyboard->hNvec, 0 /* instance */); if (nverr != NvError_Success) { + error = -ENODEV; goto fail_input_register; } @@ -408,6 +409,7 @@ static int __devexit nvec_keyboard_remove(struct platform_device *dev) return 0; } +#ifdef ENABLE_NVEC_KBD_SUSPEND static int nvec_keyboard_suspend(struct platform_device *pdev, pm_message_t state) { NvEcRequest Request = {0}; @@ -497,6 +499,7 @@ static int nvec_keyboard_resume(struct platform_device *pdev) return 0; } +#endif /* ENABLE_NVEC_KBD_SUSPEND */ static struct platform_driver nvec_keyboard_driver = { .driver = { @@ -505,8 +508,10 @@ static struct platform_driver nvec_keyboard_driver = { }, .probe = nvec_keyboard_probe, .remove = __devexit_p(nvec_keyboard_remove), +#ifdef ENABLE_NVEC_KBD_SUSPEND .suspend = nvec_keyboard_suspend, .resume = nvec_keyboard_resume, +#endif }; static int __init nvec_keyboard_init(void) -- cgit v1.2.3