svn commit: r281964 - stable/10/sys/dev/atkbdc

[Rui Paulo]

Author: rpaulo
Date: Sat Apr 25 01:23:29 2015
New Revision: 281964
URL: https://svnweb.freebsd.org/changeset/base/281964

Log:
  MFC r281704:
    Synaptics: don't report the middle button when clickPad is used.

Modified:
  stable/10/sys/dev/atkbdc/psm.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/atkbdc/psm.c
==============================================================================
--- stable/10/sys/dev/atkbdc/psm.c	Sat Apr 25 01:11:33 2015	(r281963)
+++ stable/10/sys/dev/atkbdc/psm.c	Sat Apr 25 01:23:29 2015	(r281964)
@@ -2746,7 +2746,8 @@ proc_synaptics(struct psm_softc *sc, pac
 			touchpad_buttons |= MOUSE_BUTTON4DOWN;
 		if ((pb->ipacket[3] ^ pb->ipacket[0]) & 0x02)
 			touchpad_buttons |= MOUSE_BUTTON5DOWN;
-	} else if (sc->synhw.capExtended && sc->synhw.capMiddle) {
+	} else if (sc->synhw.capExtended && sc->synhw.capMiddle &&
+	    !sc->synhw.capClickPad) {
 		/* Middle Button */
 		if ((pb->ipacket[0] ^ pb->ipacket[3]) & 0x01)
 			touchpad_buttons |= MOUSE_BUTTON2DOWN;