Commit 0c1949ae authored by Paul Fertser's avatar Paul Fertser Committed by Luis Henriques

drivers: staging: nvec: remove bogus reset command for PS/2 interface

BugLink: http://bugs.launchpad.net/bugs/1642968

commit d8f8a74d upstream.

This command was sent behind serio's back and the answer to it was
confusing atkbd probe function which lead to the elantech touchpad
getting detected as a keyboard.

To prevent this from happening just let every party do its part of the
job.
Signed-off-by: default avatarPaul Fertser <fercerpav@gmail.com>
Acked-by: default avatarMarc Dietrich <marvin24@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
parent 72958c55
...@@ -106,7 +106,6 @@ static int nvec_mouse_probe(struct platform_device *pdev) ...@@ -106,7 +106,6 @@ static int nvec_mouse_probe(struct platform_device *pdev)
{ {
struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent); struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent);
struct serio *ser_dev; struct serio *ser_dev;
char mouse_reset[] = { NVEC_PS2, SEND_COMMAND, PSMOUSE_RST, 3 };
ser_dev = devm_kzalloc(&pdev->dev, sizeof(struct serio), GFP_KERNEL); ser_dev = devm_kzalloc(&pdev->dev, sizeof(struct serio), GFP_KERNEL);
if (!ser_dev) if (!ser_dev)
...@@ -127,9 +126,6 @@ static int nvec_mouse_probe(struct platform_device *pdev) ...@@ -127,9 +126,6 @@ static int nvec_mouse_probe(struct platform_device *pdev)
serio_register_port(ser_dev); serio_register_port(ser_dev);
/* mouse reset */
nvec_write_async(nvec, mouse_reset, sizeof(mouse_reset));
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment