svn commit: r316480 - head/sys/dev/tsec

[Justin Hibbits]

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);