aboutsummaryrefslogtreecommitdiff
path: root/sys/pccard
diff options
context:
space:
mode:
authorMatthew N. Dodd <mdodd@FreeBSD.org>1999-12-03 08:41:24 +0000
committerMatthew N. Dodd <mdodd@FreeBSD.org>1999-12-03 08:41:24 +0000
commitfe0d408987b42b531420ff2de76d534dbe7ecee7 (patch)
tree6196b778a0e888c9c44157e090059018b00a3080 /sys/pccard
parentb06e7af6ddadc3933a558d3e3ab7c76125611445 (diff)
Notes
Diffstat (limited to 'sys/pccard')
-rw-r--r--sys/pccard/pccard.c3
-rw-r--r--sys/pccard/pcic.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index 8eecad86f50ae..ec56bf5e59a9a 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -366,8 +366,9 @@ allocate_driver(struct slot *slt, struct dev_desc *desc)
bcopy(desc->misc, devi->misc, sizeof(desc->misc));
resource_list_init(&devi->resources);
child = devi->isahd.id_device = device_add_child(pccarddev, devi->name,
- desc->unit, devi);
+ desc->unit);
device_set_flags(child, desc->flags);
+ device_set_ivars(child, devi);
err = bus_set_resource(child, SYS_RES_IOPORT, 0, desc->iobase,
desc->iosize);
if (err)
diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c
index 530601ded24aa..f4514a56bf88d 100644
--- a/sys/pccard/pcic.c
+++ b/sys/pccard/pcic.c
@@ -512,7 +512,7 @@ pcic_probe(device_t dev)
pcictimeout_ch = timeout(pcictimeout, 0, hz/2);
if (validslots) {
for (i = 0; i < validslots; i++) {
- device_add_child(dev, NULL, -1, NULL);
+ device_add_child(dev, NULL, -1);
}
}
return(validslots ? 0 : ENXIO);