diff options
| author | Naga Radhesh <naga.radheshy@stericsson.com> | 2011-11-14 16:39:31 +0530 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:03:38 +0200 |
| commit | aa7a9648269fc983f8c0035f353f83d608c3ed56 (patch) | |
| tree | 5bd4a8f4fc35e5d9bb14e2ffe208a55ee313c078 | |
| parent | e104612fc4bcbbf95d009e1ca0f822cf28241c88 (diff) | |
input:ske:Check for ske_enable in resume
In resume function check for keypad->enable flag
before switching to ske mode.
ST-Ericsson ID: 373297
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: Trivial
Signed-off-by: Naga Radhesh <naga.radheshy@stericsson.com>
Change-Id: Iccbe3be311821516c5bdf6333bfbf1d3779a58c9
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/37602
Reviewed-by: QATOOLS
Tested-by: Karl-Johan PERNTZ <karl-johan.perntz@stericsson.com>
Reviewed-by: Karl-Johan PERNTZ <karl-johan.perntz@stericsson.com>
Reviewed-by: Naveen Kumar GADDIPATI <naveen.gaddipati@stericsson.com>
Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
| -rw-r--r-- | drivers/input/keyboard/nomadik-ske-keypad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/nomadik-ske-keypad.c b/drivers/input/keyboard/nomadik-ske-keypad.c index 0f9966bfaca..4a38ca32d16 100644 --- a/drivers/input/keyboard/nomadik-ske-keypad.c +++ b/drivers/input/keyboard/nomadik-ske-keypad.c @@ -813,7 +813,7 @@ static int ske_keypad_resume(struct device *dev) if (device_may_wakeup(dev)) disable_irq_wake(irq); else { - if (keypad->enable_on_resume) { + if (keypad->enable_on_resume && !keypad->enable) { keypad->enable = true; ske_mode_enable(keypad, true); /* |