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

Re-arrange things in the attach routines of the 3Com and RealTek PHY

Browse Source 
drivers so that we don't clobber things or leave them uninitialized
if we abort due a failure.

Submitted by:	Luoqi Chen
This commit is contained in:
wpaul 1999-09-01 17:07:27 +00:00
parent 56d3f5a9ec
commit 2d8e4a926c
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/mii/exphy.c
View File

@ -89,7 +89,7 @@
#if !defined(lint)
static const char rcsid[] =
"$Id: exphy.c,v 1.1 1999/08/21 17:40:41 wpaul Exp $";
"$FreeBSD$";
#endif
static int exphy_probe __P((device_t));
@ -161,12 +161,6 @@ static int exphy_attach(dev)
ma = device_get_ivars(dev);
sc->mii_dev = device_get_parent(dev);
mii = device_get_softc(sc->mii_dev);
LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);
sc->mii_inst = mii->mii_instance;
sc->mii_phy = ma->mii_phyno;
sc->mii_service = exphy_service;
sc->mii_pdata = mii;
/*
* The 3Com PHY can never be isolated, so never allow non-zero
@ -177,6 +171,12 @@ static int exphy_attach(dev)
return(ENXIO);
}
LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);
sc->mii_inst = mii->mii_instance;
sc->mii_phy = ma->mii_phyno;
sc->mii_service = exphy_service;
sc->mii_pdata = mii;
mii->mii_instance++;
sc->mii_flags |= MIIF_NOISOLATE;

12
sys/dev/mii/rlphy.c
View File

@ -121,12 +121,6 @@ static int rlphy_attach(dev)
ma = device_get_ivars(dev);
sc->mii_dev = device_get_parent(dev);
mii = device_get_softc(sc->mii_dev);
LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);
sc->mii_inst = mii->mii_instance;
sc->mii_phy = ma->mii_phyno;
sc->mii_service = rlphy_service;
sc->mii_pdata = mii;
/*
* The RealTek PHY can never be isolated, so never allow non-zero
@ -137,6 +131,12 @@ static int rlphy_attach(dev)
return(ENXIO);
}
LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);
sc->mii_inst = mii->mii_instance;
sc->mii_phy = ma->mii_phyno;
sc->mii_service = rlphy_service;
sc->mii_pdata = mii;
mii->mii_instance++;
sc->mii_flags |= MIIF_NOISOLATE;