From owner-svn-src-head@freebsd.org  Tue Apr  4 02:37:42 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 6B538D2D7E5;
 Tue,  4 Apr 2017 02:37:42 +0000 (UTC)
 (envelope-from jhibbits@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 3D3EDCB4;
 Tue,  4 Apr 2017 02:37:42 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v342bflj018034;
 Tue, 4 Apr 2017 02:37:41 GMT (envelope-from jhibbits@FreeBSD.org)
Received: (from jhibbits@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v342bfeo018033;
 Tue, 4 Apr 2017 02:37:41 GMT (envelope-from jhibbits@FreeBSD.org)
Message-Id: <201704040237.v342bfeo018033@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to
 jhibbits@FreeBSD.org using -f
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Tue, 4 Apr 2017 02:37:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r316480 - head/sys/dev/tsec
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Apr 2017 02:37:42 -0000

Author: jhibbits
Date: Tue Apr  4 02:37:41 2017
New Revision: 316480
URL: https://svnweb.freebsd.org/changeset/base/316480

Log:
  Fix mis-manual merge.
  
  Timeout is now effectively a boolean rather than a time-remaining.  This was
  missed in r316478, but included in the original patch (mis-merged with a manual
  merge).

Modified:
  head/sys/dev/tsec/if_tsec.c

Modified: head/sys/dev/tsec/if_tsec.c
==============================================================================
--- head/sys/dev/tsec/if_tsec.c	Tue Apr  4 00:46:48 2017	(r316479)
+++ head/sys/dev/tsec/if_tsec.c	Tue Apr  4 02:37:41 2017	(r316480)
@@ -1597,7 +1597,7 @@ tsec_miibus_readreg(device_t dev, int ph
 	rv = TSEC_PHY_READ(sc, TSEC_REG_MIIMSTAT);
 	TSEC_PHY_UNLOCK();
 
-	if (timeout == 0)
+	if (timeout)
 		device_printf(dev, "Timeout while reading from PHY!\n");
 
 	return (rv);
@@ -1617,7 +1617,7 @@ tsec_miibus_writereg(device_t dev, int p
 	timeout = tsec_mii_wait(sc, TSEC_MIIMIND_BUSY);
 	TSEC_PHY_UNLOCK();
 
-	if (timeout == 0)
+	if (timeout)
 		device_printf(dev, "Timeout while writing to PHY!\n");
 
 	return (0);