diff options
| author | Gary King <gking@nvidia.com> | 2010-02-22 11:24:30 -0800 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2010-02-22 11:35:18 -0800 |
| commit | 3f3eefc8ac980eb3fc71aea68f0572de696c5192 (patch) | |
| tree | 0010289ae475541b028c9f3389847d2d8422b648 | |
| parent | 680e3dcf5ec147cd23c1eccf53063b2fe6d792b5 (diff) | |
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
| -rw-r--r-- | drivers/input/keyboard/tegra-nvec.c | 5 |
1 files changed, 5 insertions, 0 deletions
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) |