---

yaml --- r: 288905 b: refs/heads/master c: a573298 h: refs/heads/master i: 288903: e5be02c v: v3
git-mirror · Jan 31, 2012 · 6e94813 · 6e94813
1 parent b55fae9
commit 6e94813
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0eedab704ed93d03b1ac392fd329f7ed20ab2279
+refs/heads/master: a573298b81ffd05856ddaa222826471eabf3953b
diff --git a/trunk/drivers/staging/nvec/nvec_ps2.c b/trunk/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;
 }