mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-06 10:00:17 +00:00
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 <fercerpav@gmail.com> Acked-by: Marc Dietrich <marvin24@gmx.de> Cc: stable <stable@vger.kernel.org> # 3.4+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
d9966f1de9
commit
d8f8a74d5f
@@ -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)
|
|||||||
|
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user