---

yaml --- r: 288901 b: refs/heads/master c: d1b5342 h: refs/heads/master i: 288899: 195f637 v: v3
git-mirror · Jan 31, 2012 · cb4c8af · cb4c8af
1 parent b19357c
commit cb4c8af
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f356a67ae14033d734f73b79b926f8949300e83
+refs/heads/master: d1b5342c1f5946c2219e4e5bd770b1c1fc186272
diff --git a/trunk/drivers/staging/nvec/nvec_ps2.c b/trunk/drivers/staging/nvec/nvec_ps2.c
@@ -111,8 +111,27 @@ static int __devinit nvec_mouse_probe(struct platform_device *pdev)
 	return 0;
 }
 
+static int nvec_mouse_suspend(struct platform_device *pdev, pm_message_t state)
+{
+	struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent);
+
+	/* send cancel autoreceive */
+	nvec_write_async(nvec, "\x06\x04", 2);
+
+	return 0;
+}
+
+static int nvec_mouse_resume(struct platform_device *pdev)
+{
+	ps2_startstreaming(ps2_dev.ser_dev);
+
+	return 0;
+}
+
 static struct platform_driver nvec_mouse_driver = {
 	.probe  = nvec_mouse_probe,
+	.suspend = nvec_mouse_suspend,
+	.resume = nvec_mouse_resume,
 	.driver = {
 		.name = "nvec-mouse",
 		.owner = THIS_MODULE,