svn commit: r325345 - stable/11/sys/dev/atkbdc

[Vladimir Kondratyev]

Author: wulf
Date: Thu Nov  2 21:19:17 2017
New Revision: 325345
URL: https://svnweb.freebsd.org/changeset/base/325345

Log:
  MFC: r324774
  psm(4): Add sanity checks to Synaptics touchpad driver resolution parser.
  
  This fixes "Kernel has only x or y resolution, not both" libinput error.
  
  Reported by:	Ivan <bsd at abinet.ru>
  Tested by:	Ivan <bsd at abinet.ru>
  Approved by:	gonzo (mentor)

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

Modified: stable/11/sys/dev/atkbdc/psm.c
==============================================================================
--- stable/11/sys/dev/atkbdc/psm.c	Thu Nov  2 21:17:05 2017	(r325344)
+++ stable/11/sys/dev/atkbdc/psm.c	Thu Nov  2 21:19:17 2017	(r325345)
@@ -6094,8 +6094,10 @@ enable_synaptics(struct psm_softc *sc, enum probearg a
 		if (get_mouse_status(kbdc, status, 0, 3) != 3)
 			return (FALSE);
 
-		synhw.infoXupmm = status[0];
-		synhw.infoYupmm = status[2];
+		if (status[0] != 0 && (status[1] & 0x80) && status[2] != 0) {
+			synhw.infoXupmm = status[0];
+			synhw.infoYupmm = status[2];
+		}
 
 		if (verbose >= 2) {
 			printf("  Extended capabilities:\n");