From aa7a9648269fc983f8c0035f353f83d608c3ed56 Mon Sep 17 00:00:00 2001 From: Naga Radhesh Date: Mon, 14 Nov 2011 16:39:31 +0530 Subject: 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 Change-Id: Iccbe3be311821516c5bdf6333bfbf1d3779a58c9 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/37602 Reviewed-by: QATOOLS Tested-by: Karl-Johan PERNTZ Reviewed-by: Karl-Johan PERNTZ Reviewed-by: Naveen Kumar GADDIPATI Reviewed-by: Srinidhi KASAGAR --- drivers/input/keyboard/nomadik-ske-keypad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); /* -- cgit v1.2.3