summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-10-13 17:27:33 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-10-13 17:27:33 +0000
commitb6557eff13f03205b7ce25760a78583323090932 (patch)
tree5b0243a0ead04fb60c54839d9d6583450487ad49
parentaddbcbbb1de0446c7c6005bb3bb17a529d2dc6fa (diff)
Fix & vs. && bug in PHY detection. Found by Chad.
-rw-r--r--drivers/net/ioc3-eth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 91b6763f4..679d9ed6b 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -606,7 +606,7 @@ static int ioc3_mii_init(struct net_device *dev, struct ioc3_private *ip,
phy = -1;
for (i = 0; i < 32; i++) {
word = mii_read(ioc3, i, 2);
- if ((word != 0xffff) & (word != 0x0000)) {
+ if ((word != 0xffff) && (word != 0x0000)) {
phy = i;
break; /* Found a PHY */
}