From owner-svn-src-stable-11@freebsd.org  Thu Nov  2 21:19:19 2017
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0B54AE633F0;
 Thu,  2 Nov 2017 21:19:19 +0000 (UTC)
 (envelope-from wulf@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CB7CA6A09B;
 Thu,  2 Nov 2017 21:19:18 +0000 (UTC)
 (envelope-from wulf@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2LJHcm055784;
 Thu, 2 Nov 2017 21:19:17 GMT (envelope-from wulf@FreeBSD.org)
Received: (from wulf@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2LJHhc055782;
 Thu, 2 Nov 2017 21:19:17 GMT (envelope-from wulf@FreeBSD.org)
Message-Id: <201711022119.vA2LJHhc055782@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wulf set sender to
 wulf@FreeBSD.org using -f
From: Vladimir Kondratyev <wulf@FreeBSD.org>
Date: Thu, 2 Nov 2017 21:19:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r325345 - stable/11/sys/dev/atkbdc
X-SVN-Group: stable-11
X-SVN-Commit-Author: wulf
X-SVN-Commit-Paths: stable/11/sys/dev/atkbdc
X-SVN-Commit-Revision: 325345
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Nov 2017 21:19:19 -0000

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@abinet.ru>
  Tested by:	Ivan <bsd@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");