From: Marc Dietrich <marvin24@gmx.de>
Date: Mon, 26 Dec 2011 16:57:36 +0000 (+0100)
Subject: staging: nvec: ps2: disable/enable mouse on suspend/resume
X-Git-Tag: MMI-PSA29.97-13-9~17268^2~176^2~175
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a573298b81ffd05856ddaa222826471eabf3953b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

staging: nvec: ps2: disable/enable mouse on suspend/resume

This change makes the touchpad buttons work after suspend/resume.

Signed-off-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Julian Andres Klode <jak@jak-linux.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/nvec/nvec_ps2.c b/drivers/staging/nvec/nvec_ps2.c
index 7f470ba1160c..4be3d220a634 100644
--- a/drivers/staging/nvec/nvec_ps2.c
+++ b/drivers/staging/nvec/nvec_ps2.c
@@ -123,6 +123,9 @@ static int nvec_mouse_suspend(struct platform_device *pdev, pm_message_t state)
 {
 	struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent);
 
+	/* disable mouse */
+	nvec_write_async(nvec, "\x06\xf4", 2);
+
 	/* send cancel autoreceive */
 	nvec_write_async(nvec, "\x06\x04", 2);
 
@@ -131,8 +134,13 @@ static int nvec_mouse_suspend(struct platform_device *pdev, pm_message_t state)
 
 static int nvec_mouse_resume(struct platform_device *pdev)
 {
+	struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent);
+
 	ps2_startstreaming(ps2_dev.ser_dev);
 
+	/* enable mouse */
+	nvec_write_async(nvec, "\x06\xf5", 2);
+
 	return 0;
 }