[PATCH 3/3] input: spear-keyboard: Fix for balancing the enable_irq_wake
From: Viresh Kumar <viresh.kumar@linaro.org>
Date: 2012-11-08 13:42:27
Also in:
lkml
Subsystem:
input (keyboard, mouse, joystick, touchscreen) drivers, the rest · Maintainers:
Dmitry Torokhov, Linus Torvalds
From: Deepak Sikri <redacted> 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 <redacted> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- drivers/input/keyboard/spear-keyboard.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/input/keyboard/spear-keyboard.c b/drivers/input/keyboard/spear-keyboard.c
index 9792924..b8784df 100644
--- a/drivers/input/keyboard/spear-keyboard.c
+++ b/drivers/input/keyboard/spear-keyboard.c@@ -60,6 +60,7 @@ struct spear_kbd { struct clk *clk; unsigned int irq; unsigned int mode; + unsigned int irq_wake; unsigned short last_key; unsigned short keycodes[NUM_ROWS * NUM_COLS]; bool rep;
@@ -327,7 +328,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 = 1; /* * reprogram the keyboard operating frequency as on some
@@ -373,7 +375,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) { + kbd->irq_wake = 0; + disable_irq_wake(kbd->irq); + } } else { if (input_dev->users) clk_enable(kbd->clk);
--
1.7.12.rc2.18.g61b472e