aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/etherswitch
diff options
context:
space:
mode:
authorAdrian Chadd <adrian@FreeBSD.org>2017-05-06 06:07:44 +0000
committerAdrian Chadd <adrian@FreeBSD.org>2017-05-06 06:07:44 +0000
commit034aec8568bb6901ee5cb78bbe06acf31f4ac218 (patch)
tree011a3a31c00e95661609076502e3a0c7b8e75b7d /sys/dev/etherswitch
parenta10430e0a387db5eb6a932a3e7f53358b4441368 (diff)
Notes
Diffstat (limited to 'sys/dev/etherswitch')
-rw-r--r--sys/dev/etherswitch/e6000sw/e6060sw.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/etherswitch/e6000sw/e6060sw.c b/sys/dev/etherswitch/e6000sw/e6060sw.c
index cdd3fa519340..fedc1e4ac9f6 100644
--- a/sys/dev/etherswitch/e6000sw/e6060sw.c
+++ b/sys/dev/etherswitch/e6000sw/e6060sw.c
@@ -169,6 +169,7 @@ e6060sw_probe(device_t dev)
sc = device_get_softc(dev);
bzero(sc, sizeof(*sc));
+ devid = 0;
for (i = 0; i < 2; ++i) {
data = MDIO_READREG(device_get_parent(dev),
CORE_REGISTER + i * 0x10, SWITCH_ID);
@@ -184,8 +185,6 @@ e6060sw_probe(device_t dev)
break;
}
}
- if (i == 2)
- return (ENXIO);
if (devid == E6060)
devname = "88E6060";
@@ -193,6 +192,9 @@ e6060sw_probe(device_t dev)
devname = "88E6063";
else if (devid == E6065)
devname = "88E6065";
+ else
+ return (ENXIO);
+
sprintf(desc, "Marvell %s MDIO switch driver at 0x%02x",
devname, sc->smi_offset);
device_set_desc_copy(dev, desc);