openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: nvec: fix mouse suspend/resume calls 

The EC command for enable/disable is not an EC command. Instead it needs
to be send to the mouse.

Signed-off-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Marc Dietrich 2013-01-27 17:43:42 +01:00 committed by Greg Kroah-Hartman
parent 518945fbfb
commit 85a90528b2
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/nvec/nvec_ps2.c
View File

@ -25,6 +25,9 @@
#define STOP_STREAMING {'\x06', '\x04'} #define STOP_STREAMING {'\x06', '\x04'}
#define SEND_COMMAND {'\x06', '\x01', '\xf4', '\x01'} #define SEND_COMMAND {'\x06', '\x01', '\xf4', '\x01'}
#define ENABLE_MOUSE 0xf4
#define DISABLE_MOUSE 0xf5
#ifdef NVEC_PS2_DEBUG #ifdef NVEC_PS2_DEBUG
#define NVEC_PHD(str, buf, len) \ #define NVEC_PHD(str, buf, len) \
print_hex_dump(KERN_DEBUG, str, DUMP_PREFIX_NONE, \ print_hex_dump(KERN_DEBUG, str, DUMP_PREFIX_NONE, \
@ -133,27 +136,22 @@ static int nvec_mouse_remove(struct platform_device *pdev)
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int nvec_mouse_suspend(struct device *dev) static int nvec_mouse_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev);
struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent);
/* disable mouse */ /* disable mouse */
nvec_write_async(nvec, "\x06\xf4", 2); ps2_sendcommand(ps2_dev.ser_dev, DISABLE_MOUSE);
/* send cancel autoreceive */ /* send cancel autoreceive */
nvec_write_async(nvec, "\x06\x04", 2); ps2_stopstreaming(ps2_dev.ser_dev);
return 0; return 0;
} }
static int nvec_mouse_resume(struct device *dev) static int nvec_mouse_resume(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); /* start streaming */
struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent);
ps2_startstreaming(ps2_dev.ser_dev); ps2_startstreaming(ps2_dev.ser_dev);
/* enable mouse */ /* enable mouse */
nvec_write_async(nvec, "\x06\xf5", 2); ps2_sendcommand(ps2_dev.ser_dev, ENABLE_MOUSE);
return 0; return 0;
} }