diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-01-27 14:43:10 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-01-27 17:18:40 -0800 |
| commit | c734a6c3417c4f67d38f3cce556ff680c4e56010 (patch) | |
| tree | bd301203b48f38f5c66c23b1dc018f3680b39c01 /drivers | |
| parent | 4b5613344bd68424b09afda5535767a1aae9f598 (diff) | |
Revert "input: gpio-keys: wake up display on resume"
This reverts commit 0ddc54a60b12fb13fec7c5d8f9ff3f162c96818f.
It leads to suspend-resume cycle as mentioned in the below bug.
BUG 773133
Change-Id: I51e2a48a000752d4aba02bd3f8e7e8ab18316371
Reviewed-on: http://git-master/r/17178
Tested-by: Nitin Kumbhar <nkumbhar@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/keyboard/gpio_keys.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index b80b5d8ac5bd..6069abe31e42 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -601,10 +601,7 @@ static int gpio_keys_resume(struct device *dev) struct gpio_keys_button *button = &pdata->buttons[i]; if (button->wakeup && device_may_wakeup(&pdev->dev)) { int irq = gpio_to_irq(button->gpio); - unsigned int type = button->type ?: EV_KEY; disable_irq_wake(irq); - input_event(ddata->input, type, button->code, 1); - input_sync(ddata->input); } gpio_keys_report_event(&ddata->data[i]); |