summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-08-04 02:55:39 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-08-04 02:55:39 +0000
commit1f8c5b950ce156e64bd032248780f67f5cf00ac5 (patch)
tree0c55e8f49e605ec2a6213d7e897a88835b570f57 /sys/dev
parent6b2031e5974c3f8df452c41c43d2f6ebf0c33e41 (diff)
Fix busy check for PHY write operation with Yukon chips.
From yongari@FreeBSD
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_sk.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index 8b359d843b1..60ecbddf016 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sk.c,v 1.118 2006/07/30 18:48:52 brad Exp $ */
+/* $OpenBSD: if_sk.c,v 1.119 2006/08/04 02:55:38 brad Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -418,7 +418,7 @@ sk_marv_miibus_writereg(struct device *dev, int phy, int reg, int val)
for (i = 0; i < SK_TIMEOUT; i++) {
DELAY(1);
- if (SK_YU_READ_2(sc_if, YUKON_SMICR) & YU_SMICR_BUSY)
+ if (!(SK_YU_READ_2(sc_if, YUKON_SMICR) & YU_SMICR_BUSY))
break;
}
@@ -2857,7 +2857,7 @@ sk_stop(struct sk_if_softc *sc_if)
CSR_WRITE_4(sc, sc_if->sk_tx_bmu, SK_TXBMU_TX_STOP);
for (i = 0; i < SK_TIMEOUT; i++) {
val = CSR_READ_4(sc, sc_if->sk_tx_bmu);
- if ((val & SK_TXBMU_TX_STOP) == 0)
+ if (!(val & SK_TXBMU_TX_STOP))
break;
DELAY(1);
}
@@ -2868,7 +2868,7 @@ sk_stop(struct sk_if_softc *sc_if)
SK_IF_WRITE_4(sc_if, 0, SK_RXQ1_BMU_CSR, SK_RXBMU_RX_STOP);
for (i = 0; i < SK_TIMEOUT; i++) {
val = SK_IF_READ_4(sc_if, 0, SK_RXQ1_BMU_CSR);
- if ((val & SK_RXBMU_RX_STOP) == 0)
+ if (!(val & SK_RXBMU_RX_STOP))
break;
DELAY(1);
}