SPEAr keyboard should normally disable clock during suspend and enable it during resume. For cases where it is expected to act as a wakeup source the clock can remain in the same state i.e. kept enabled if it is being used. Signed-off-by: Shiraz Hashim <shiraz.hashim@xxxxxx> --- drivers/input/keyboard/spear-keyboard.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/input/keyboard/spear-keyboard.c b/drivers/input/keyboard/spear-keyboard.c index 67d9afb..ef147f3 100644 --- a/drivers/input/keyboard/spear-keyboard.c +++ b/drivers/input/keyboard/spear-keyboard.c @@ -318,12 +318,12 @@ static int spear_kbd_suspend(struct device *dev) mutex_lock(&input_dev->mutex); - if (input_dev->users) - clk_enable(kbd->clk); - if (device_may_wakeup(&pdev->dev)) { if (!enable_irq_wake(kbd->irq)) kbd->irq_wake = 1; + } else { + if (input_dev->users) + clk_disable(kbd->clk); } mutex_unlock(&input_dev->mutex); @@ -344,11 +344,11 @@ static int spear_kbd_resume(struct device *dev) kbd->irq_wake = 0; disable_irq_wake(kbd->irq); } + } else { + if (input_dev->users) + clk_enable(kbd->clk); } - if (input_dev->users) - clk_enable(kbd->clk); - mutex_unlock(&input_dev->mutex); return 0; -- 1.7.10 -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html