aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorDoug Rabson <dfr@FreeBSD.org>1999-09-17 08:18:34 +0000
committerDoug Rabson <dfr@FreeBSD.org>1999-09-17 08:18:34 +0000
commit336dd1864d41c299de3e2ed848c96b65aa6cb679 (patch)
treee2b51552a43267fee78f5e3f2423ebabb9afa9cd /sys
parentbb01f28e97a350e6c28ad50528a07e7473c6f756 (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/isa/pnp.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/isa/pnp.c b/sys/isa/pnp.c
index 903087413ac8..3102408f9078 100644
--- a/sys/isa/pnp.c
+++ b/sys/isa/pnp.c
@@ -383,6 +383,7 @@ pnp_scan_resdata(device_t parent, pnp_id *p, int csn)
struct isa_config *config;
struct pnp_set_config_arg *csnldn;
int priority = 0;
+ int seenalt = 0;
char *desc = 0;
bzero(&card, sizeof card);
@@ -431,6 +432,7 @@ pnp_scan_resdata(device_t parent, pnp_id *p, int csn)
ISA_SET_CONFIG_CALLBACK(parent, dev,
pnp_set_config,
csnldn);
+ seenalt = 0;
ldn++;
break;
@@ -498,6 +500,7 @@ pnp_scan_resdata(device_t parent, pnp_id *p, int csn)
case PNP_TAG_END_DEPENDANT:
ISA_ADD_CONFIG(parent, dev, priority, config);
config = &logdev;
+ seenalt = 1;
break;
case PNP_TAG_IO_RANGE:
@@ -541,6 +544,9 @@ pnp_scan_resdata(device_t parent, pnp_id *p, int csn)
break;
case PNP_TAG_END:
+ if (!seenalt)
+ ISA_ADD_CONFIG(parent, dev,
+ priority, config);
scanning = 0;
break;