Input: spear_keyboard - fix clock handling during suspend/resume

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@st.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/keyboard/spear-keyboard.c b/drivers/input/keyboard/spear-keyboard.c
index c499387d8735aea3044fcec080682aa58d1a5305..617a33dc2ef351b35f94a7fd5d86f922d90f84d8 100644 (file)
--- a/drivers/input/keyboard/spear-keyboard.c
+++ b/drivers/input/keyboard/spear-keyboard.c
@@ -320,11 +320,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 (device_may_wakeup(&pdev->dev)) {
                enable_irq_wake(kbd->irq);
+       } else {
+               if (input_dev->users)
+                       clk_disable(kbd->clk);
+       }
 
        mutex_unlock(&input_dev->mutex);
 
@@ -339,11 +340,12 @@ static int spear_kbd_resume(struct device *dev)
 
        mutex_lock(&input_dev->mutex);
 
-       if (device_may_wakeup(&pdev->dev))
+       if (device_may_wakeup(&pdev->dev)) {
                disable_irq_wake(kbd->irq);
-
-       if (input_dev->users)
-               clk_enable(kbd->clk);
+       } else {
+               if (input_dev->users)
+                       clk_enable(kbd->clk);
+       }
 
        mutex_unlock(&input_dev->mutex);