summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2005-09-17 20:16:32 +0000
committerBrad Smith <brad@cvs.openbsd.org>2005-09-17 20:16:32 +0000
commit702498d22a45295e84adb03a7bbfb705bb141e87 (patch)
treee97b0f71f341877d605dbd60ea9277558743e0c2 /sys
parent115cf216f36f0f885e278fa8972f9fc6b434c2ac (diff)
KNF
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/mii/brgphy.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index d226c7defb6..a0b4d5b576c 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: brgphy.c,v 1.30 2005/09/17 20:09:55 brad Exp $ */
+/* $OpenBSD: brgphy.c,v 1.31 2005/09/17 20:16:31 brad Exp $ */
/*
* Copyright (c) 2000
@@ -123,9 +123,9 @@ brgphy_probe(struct device *parent, void *match, void *aux)
struct mii_attach_args *ma = aux;
if (mii_phy_match(ma, brgphys) != NULL)
- return(10);
+ return (10);
- return(0);
+ return (0);
}
void
@@ -145,9 +145,11 @@ brgphy_attach(struct device *parent, struct device *self, void *aux)
sc->mii_model = MII_MODEL(ma->mii_id2);
sc->mii_rev = MII_REV(ma->mii_id2);
sc->mii_pdata = mii;
- sc->mii_flags = ma->mii_flags | MIIF_NOISOLATE;
+ sc->mii_flags = ma->mii_flags;
sc->mii_anegticks = MII_ANEGTICKS;
+ sc->mii_flags |= MIIF_NOISOLATE;
+
PHY_RESET(sc);
sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask;