Input: spear-keyboard - fix for balancing the enable_irq_wake

This patch handles the fix for unbalanced irq for the cases when
enable_irq_wake fails, and a warning related to same is displayed
on the console. The workaround is handled at the driver level.

Signed-off-by: Deepak Sikri <deepak.sikri@st.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/input/keyboard/spear-keyboard.c b/drivers/input/keyboard/spear-keyboard.c
index c7ca97f44bfb..7685b476d6c1 100644
--- a/drivers/input/keyboard/spear-keyboard.c
+++ b/drivers/input/keyboard/spear-keyboard.c
@@ -60,10 +60,11 @@ struct spear_kbd {
         struct clk *clk;
         unsigned int irq;
         unsigned int mode;
+        unsigned int suspended_rate;
         unsigned short last_key;
         unsigned short keycodes[NUM_ROWS * NUM_COLS];
         bool rep;
-        unsigned int suspended_rate;
+        bool irq_wake_enabled;
         u32 mode_ctl_reg;
 };
 
@@ -333,7 +334,8 @@ static int spear_kbd_suspend(struct device *dev)
         mode_ctl_reg = readl_relaxed(kbd->io_base + MODE_CTL_REG);
 
         if (device_may_wakeup(&pdev->dev)) {
-                enable_irq_wake(kbd->irq);
+                if (!enable_irq_wake(kbd->irq))
+                        kbd->irq_wake_enabled = true;
 
                 /*
                  * reprogram the keyboard operating frequency as on some
@@ -379,7 +381,10 @@ static int spear_kbd_resume(struct device *dev)
         mutex_lock(&input_dev->mutex);
 
         if (device_may_wakeup(&pdev->dev)) {
-                disable_irq_wake(kbd->irq);
+                if (kbd->irq_wake_enabled) {
+                        kbd->irq_wake_enabled = false;
+                        disable_irq_wake(kbd->irq);
+                }
         } else {
                 if (input_dev->users)
                         clk_enable(kbd->clk);