d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mis-manual merge.

Browse Source 
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).
This commit is contained in:
jhibbits 2017-04-04 02:37:41 +00:00
parent 2198e1a1e2
commit 5b67ceb70e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/tsec/if_tsec.c
View File

@ -1597,7 +1597,7 @@ tsec_miibus_readreg(device_t dev, int phy, int reg)
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 phy, int reg, int value)
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);