From owner-svn-src-all@FreeBSD.ORG  Tue Jun 16 15:39:35 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A0994B52;
 Tue, 16 Jun 2015 15:39:35 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 8EBEDD70;
 Tue, 16 Jun 2015 15:39:35 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GFdZsG036917;
 Tue, 16 Jun 2015 15:39:35 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GFdZcq036916;
 Tue, 16 Jun 2015 15:39:35 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201506161539.t5GFdZcq036916@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 16 Jun 2015 15:39:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284450 - head/sys/dev/atkbdc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Jun 2015 15:39:35 -0000

Author: glebius
Date: Tue Jun 16 15:39:34 2015
New Revision: 284450
URL: https://svnweb.freebsd.org/changeset/base/284450

Log:
  Fix miss from r284320.
  
  Coverity:	1018895

Modified:
  head/sys/dev/atkbdc/psm.c

Modified: head/sys/dev/atkbdc/psm.c
==============================================================================
--- head/sys/dev/atkbdc/psm.c	Tue Jun 16 15:14:40 2015	(r284449)
+++ head/sys/dev/atkbdc/psm.c	Tue Jun 16 15:39:34 2015	(r284450)
@@ -5102,7 +5102,7 @@ enable_trackpoint(struct psm_softc *sc, 
 	id = read_aux_data(kbdc);
 	if (id < 0x01)
 		return (FALSE);
-	if (sc != NULL)
+	if (arg == PROBE)
 		sc->tphw = id;
 	if (!trackpoint_support)
 		return (FALSE);