Skip to content

Commit d8f8a74

Browse files
paulfertsergregkh
authored andcommitted
drivers: staging: nvec: remove bogus reset command for PS/2 interface
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: Paul Fertser <[email protected]> Acked-by: Marc Dietrich <[email protected]> Cc: stable <[email protected]> # 3.4+ Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent d9966f1 commit d8f8a74

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

drivers/staging/nvec/nvec_ps2.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ static int nvec_mouse_probe(struct platform_device *pdev)
106106
{
107107
struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent);
108108
struct serio *ser_dev;
109-
char mouse_reset[] = { NVEC_PS2, SEND_COMMAND, PSMOUSE_RST, 3 };
110109

111110
ser_dev = devm_kzalloc(&pdev->dev, sizeof(struct serio), GFP_KERNEL);
112111
if (!ser_dev)
@@ -127,9 +126,6 @@ static int nvec_mouse_probe(struct platform_device *pdev)
127126

128127
serio_register_port(ser_dev);
129128

130-
/* mouse reset */
131-
nvec_write_async(nvec, mouse_reset, sizeof(mouse_reset));
132-
133129
return 0;
134130
}
135131

0 commit comments

Comments
 (0)