diff options
author | Marc Dietrich <marvin24@gmx.de> | 2011-12-26 11:57:36 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-31 13:27:58 -0500 |
commit | a573298b81ffd05856ddaa222826471eabf3953b (patch) | |
tree | e2830a7743a96e087b001c521132ea71fa22f5b8 /drivers/staging/nvec | |
parent | 0eedab704ed93d03b1ac392fd329f7ed20ab2279 (diff) |
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>
Diffstat (limited to 'drivers/staging/nvec')
-rw-r--r-- | drivers/staging/nvec/nvec_ps2.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/staging/nvec/nvec_ps2.c b/drivers/staging/nvec/nvec_ps2.c index 7f470ba1160..4be3d220a63 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) | |||
123 | { | 123 | { |
124 | struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent); | 124 | struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent); |
125 | 125 | ||
126 | /* disable mouse */ | ||
127 | nvec_write_async(nvec, "\x06\xf4", 2); | ||
128 | |||
126 | /* send cancel autoreceive */ | 129 | /* send cancel autoreceive */ |
127 | nvec_write_async(nvec, "\x06\x04", 2); | 130 | nvec_write_async(nvec, "\x06\x04", 2); |
128 | 131 | ||
@@ -131,8 +134,13 @@ static int nvec_mouse_suspend(struct platform_device *pdev, pm_message_t state) | |||
131 | 134 | ||
132 | static int nvec_mouse_resume(struct platform_device *pdev) | 135 | static int nvec_mouse_resume(struct platform_device *pdev) |
133 | { | 136 | { |
137 | struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent); | ||
138 | |||
134 | ps2_startstreaming(ps2_dev.ser_dev); | 139 | ps2_startstreaming(ps2_dev.ser_dev); |
135 | 140 | ||
141 | /* enable mouse */ | ||
142 | nvec_write_async(nvec, "\x06\xf5", 2); | ||
143 | |||
136 | return 0; | 144 | return 0; |
137 | } | 145 | } |
138 | 146 | ||