]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
staging: nvec: ps2: disable/enable mouse on suspend/resume
authorMarc Dietrich <marvin24@gmx.de>
Mon, 26 Dec 2011 16:57:36 +0000 (17:57 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 31 Jan 2012 18:27:58 +0000 (10:27 -0800)
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>
drivers/staging/nvec/nvec_ps2.c

index 7f470ba1160c69e5f24730fa0ba18fc8d71afb11..4be3d220a634a05759ab9ee5d7215fbe5b7fe47a 100644 (file)
@@ -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;
 }