633aae2 "Input: i8042 - switch to using dev_pm_ops"
removed handling for PMSG_THAW, causing obscure breakage.
It can break if you press keys during hibernation,
which causes subsequent keypresses to be lost -
so you can't cancel s2disk by pressing backspace -
and then just before system poweroff you get
"psmouse.c: Failed to deactivate mouse".
So let's add the thaw handler back.
Also set the freeze handler. It looks like PMSG_FREEZE
didn't do anything in the past, but I think that must
have been an oversight.
Signed-off-by: Alan Jenkins <alan-jenkins@xxxxxxxxxxxxxx>
---
drivers/input/serio/i8042.c | 2 ++
drivers/input/serio/serio.c | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index d84a36e..9599766 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -1164,6 +1164,8 @@ static int i8042_pm_restore(struct device *dev)
static const struct dev_pm_ops i8042_pm_ops = {
.suspend = i8042_pm_reset,
.resume = i8042_pm_restore,
+ .freeze = i8042_pm_reset,
+ .thaw = i8042_pm_restore,
.poweroff = i8042_pm_reset,
.restore = i8042_pm_restore,
};
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index e0f3018..2e8f544 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -949,6 +949,8 @@ static int serio_resume(struct device *dev)
static const struct dev_pm_ops serio_pm_ops = {
.suspend = serio_suspend,
.resume = serio_resume,
+ .freeze = serio_suspend,
+ .thaw = serio_resume,
.poweroff = serio_suspend,
.restore = serio_resume,
};
--
1.6.3.3
--
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
