diff options
| -rw-r--r-- | sys/dev/mii/mii.c | 7 | ||||
| -rw-r--r-- | sys/pci/if_ste.c | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c index aad3573..9a63276 100644 --- a/sys/dev/mii/mii.c +++ b/sys/dev/mii/mii.c @@ -110,17 +110,14 @@ int miibus_probe(dev) { struct mii_attach_args ma, *args; struct mii_data *mii; - device_t child = NULL, parent, *children; - int bmsr, capmask = 0xFFFFFFFF, nchildren; + device_t child = NULL, parent; + int bmsr, capmask = 0xFFFFFFFF; mii = device_get_softc(dev); parent = device_get_parent(dev); LIST_INIT(&mii->mii_phys); for (ma.mii_phyno = 0; ma.mii_phyno < MII_NPHY; ma.mii_phyno++) { - device_get_children(dev, &children, &nchildren); - if (nchildren) - break; /* * Check to see if there is a PHY at this address. Note, * many braindead PHYs report 0/0 in their ID registers, diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c index 73f218c..5a2a814 100644 --- a/sys/pci/if_ste.c +++ b/sys/pci/if_ste.c @@ -380,6 +380,11 @@ static int ste_miibus_readreg(dev, phy, reg) sc = device_get_softc(dev); + if (pci_get_vendor(dev) == DL_VENDORID && + pci_get_device(dev) == DL_DEVICEID_550TX && + phy != 0) + return (0); + bzero((char *)&frame, sizeof(frame)); frame.mii_phyaddr = phy; |
