summaryrefslogtreecommitdiffstats
path: root/sys/dev/ed
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2005-09-07 00:00:16 +0000
committerimp <imp@FreeBSD.org>2005-09-07 00:00:16 +0000
commit6543a6f5bc2fbc6499b9ee8c5ae2a98eaa8736ad (patch)
treea4128a05c554ae4ed0a9e7f8cab32f58c65c92ee /sys/dev/ed
parent767662ea7f70ea05914e60e4d84e86ce3a3cbf01 (diff)
downloadFreeBSD-src-6543a6f5bc2fbc6499b9ee8c5ae2a98eaa8736ad.zip
FreeBSD-src-6543a6f5bc2fbc6499b9ee8c5ae2a98eaa8736ad.tar.gz
Fix DL100xx based cards. Don't drop resources. It was approrpiate in
the probe code that this used to be part of, but as part of the attach, we shouldn't be dropping the resources here. Also, allocate the proper rid in the ax88x90 setup.
Diffstat (limited to 'sys/dev/ed')
-rw-r--r--sys/dev/ed/if_ed_pccard.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c
index 6a162a5..378e9a0 100644
--- a/sys/dev/ed/if_ed_pccard.c
+++ b/sys/dev/ed/if_ed_pccard.c
@@ -293,7 +293,6 @@ ed_pccard_attach(device_t dev)
error = ed_probe_Novell(dev, sc->port_rid, 0);
if (error == 0)
error = ed_pccard_Linksys(dev);
- ed_release_resources(dev);
if (error == 0)
goto end2;
}
@@ -581,7 +580,7 @@ ed_pccard_ax88x90(device_t dev)
}
ax88x90_geteprom(sc);
ed_release_resources(dev);
- error = ed_probe_Novell(dev, 0, flags);
+ error = ed_probe_Novell(dev, sc->port_rid, flags);
if (error == 0) {
sc->vendor = ED_VENDOR_NOVELL;
sc->type = ED_TYPE_NE2000;
OpenPOWER on IntegriCloud