[<prev] [next>] [day] [month] [year] [list]
Message-ID: <4B7BCD1C.4020102@tuffmail.co.uk>
Date: Wed, 17 Feb 2010 11:03:56 +0000
From: Alan Jenkins <alan-jenkins@...fmail.co.uk>
To: Dmitry Torokhov <dmitry.torokhov@...il.com>
CC: linux-input@...r.kernel.org,
linux-kernel <linux-kernel@...r.kernel.org>
Subject: [PATCH] Input: serio - add thaw
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".
Apparently freeze/thaw doesn't need the heavyweight
enable/disable cycle. So we just need to check for
pending events at thaw time, by running the interrupt
handler.
Signed-off-by: Alan Jenkins <alan-jenkins@...fmail.co.uk>
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index d84a36e..b54aee7 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -1161,9 +1161,17 @@ static int i8042_pm_restore(struct device *dev)
return 0;
}
+static int i8042_pm_thaw(struct device *dev)
+{
+ i8042_interrupt(0, NULL);
+
+ return 0;
+}
+
static const struct dev_pm_ops i8042_pm_ops = {
.suspend = i8042_pm_reset,
.resume = i8042_pm_restore,
+ .thaw = i8042_pm_thaw,
.poweroff = i8042_pm_reset,
.restore = i8042_pm_restore,
};
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists