summaryrefslogtreecommitdiffstats
path: root/sys/dev/cardbus
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2002-09-10 06:37:02 +0000
committerimp <imp@FreeBSD.org>2002-09-10 06:37:02 +0000
commit7896bf0965c048b61e89926bfeaaf12e29b945aa (patch)
tree924e2ed221e2977aceb2372b881c1f04e87985e0 /sys/dev/cardbus
parent2b0481758d6e2854ffade230150c648ff428275e (diff)
downloadFreeBSD-src-7896bf0965c048b61e89926bfeaaf12e29b945aa.zip
FreeBSD-src-7896bf0965c048b61e89926bfeaaf12e29b945aa.tar.gz
Remove more bogus reprobe code. I don't think it is needed here either.
Diffstat (limited to 'sys/dev/cardbus')
-rw-r--r--sys/dev/cardbus/cardbus.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index 43b0858..c0f0c34 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -320,18 +320,6 @@ cardbus_driver_added(device_t cbdev, driver_t *driver)
device_get_children(cbdev, &devlist, &numdevs);
- cardattached = 0;
- for (tmp = 0; tmp < numdevs; tmp++) {
- if (device_get_state(devlist[tmp]) != DS_NOTPRESENT)
- cardattached++;
- }
-
- if (cardattached == 0) {
- free(devlist, M_TEMP);
- CARD_REPROBE_CARD(device_get_parent(cbdev), cbdev);
- return;
- }
-
DEVICE_IDENTIFY(driver, cbdev);
for (tmp = 0; tmp < numdevs; tmp++) {
if (device_get_state(devlist[tmp]) == DS_NOTPRESENT) {
@@ -342,8 +330,7 @@ cardbus_driver_added(device_t cbdev, driver_t *driver)
cardbus_do_cis(cbdev, dinfo->pci.cfg.dev);
if (device_probe_and_attach(dinfo->pci.cfg.dev) != 0) {
cardbus_release_all_resources(cbdev, dinfo);
- } else
- cardattached++;
+ }
}
}
OpenPOWER on IntegriCloud