diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-04-25 10:33:37 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-04-25 10:33:37 +0000 |
| commit | ec3dec9c5e463d0e88d0f97128cd71b8c07fbb1f (patch) | |
| tree | 73e9c3b3cedb39d9b53d39b01ec05b8f535b3473 /sys/dev/pckbc | |
| parent | 2bf41ce0579302d8854d781482f888f87c6eb5b2 (diff) | |
Do no reprobe for a supported protocol when enabling a pointing
device of type PMS_STANDARD, probing during autoconf(9) is enough!.
In such case, the device can be a simple PS/2 mouse, a unsupported
touchpad or a downgraded touchpad if something bad happened. But
it is very unlikely that reprobing will improve the situation and
transform a standard mouse into a multitouch-aware touchpad ;)
This fixes the 12 seconds delay seen on various Dell laptops (E4310
and Latitude D630) when starting Xorg, reported by KÄrlis MiÄ·elsons
on bugs@.
ok stsp@, dcoppa@, shadchin@
Diffstat (limited to 'sys/dev/pckbc')
| -rw-r--r-- | sys/dev/pckbc/pms.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pckbc/pms.c b/sys/dev/pckbc/pms.c index af1b9087357..4a6de176166 100644 --- a/sys/dev/pckbc/pms.c +++ b/sys/dev/pckbc/pms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pms.c,v 1.49 2013/10/30 18:00:56 shadchin Exp $ */ +/* $OpenBSD: pms.c,v 1.50 2014/04/25 10:33:36 mpi Exp $ */ /* $NetBSD: psm.c,v 1.11 2000/06/05 22:20:57 sommerfeld Exp $ */ /*- @@ -735,7 +735,7 @@ pms_change_state(struct pms_softc *sc, int newstate, int dev) pckbc_flush(sc->sc_kbctag, PCKBC_AUX_SLOT); pms_reset(sc); - if (sc->protocol->type == PMS_STANDARD || + if (sc->protocol->enable != NULL && sc->protocol->enable(sc) == 0) pms_protocol_lookup(sc); |