Skip to content

Commit 17c1c9b

Browse files
paulfertsergregkh
authored andcommitted
Revert "staging: nvec: ps2: change serio type to passthrough"
This reverts commit 36b30d6. This is necessary to detect paz00 (ac100) touchpad properly as one speaking ETPS/2 protocol. Without it X.org's synaptics driver doesn't work as the touchpad is detected as an ImPS/2 mouse instead. Commit ec6184b changed the way auto-detection is performed on ports marked as pass through and made the issue apparent. A pass through port is an additional PS/2 port used to connect a slave device to a master device that is using PS/2 to communicate with the host (so slave's PS/2 communication is tunneled over master's PS/2 link). "Synaptics PS/2 TouchPad Interfacing Guide" describes such a setup (PS/2 PASS-THROUGH OPTION section). Since paz00's embedded controller is not connected to a PS/2 port itself, the PS/2 interface it exposes is not a pass-through one. Signed-off-by: Paul Fertser <[email protected]> Acked-by: Marc Dietrich <[email protected]> Fixes: 36b30d6 ("staging: nvec: ps2: change serio type to passthrough") Cc: stable <[email protected]> # 3.4+ Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent d8f8a74 commit 17c1c9b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/staging/nvec/nvec_ps2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ static int nvec_mouse_probe(struct platform_device *pdev)
111111
if (!ser_dev)
112112
return -ENOMEM;
113113

114-
ser_dev->id.type = SERIO_PS_PSTHRU;
114+
ser_dev->id.type = SERIO_8042;
115115
ser_dev->write = ps2_sendcommand;
116116
ser_dev->start = ps2_startstreaming;
117117
ser_dev->stop = ps2_stopstreaming;

0 commit comments

Comments
 (0)