diff options
| author | jhb <jhb@FreeBSD.org> | 2004-06-01 19:51:29 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2004-06-01 19:51:29 +0000 |
| commit | 33b8939d73235aaa07846c64a4cc0f7dd7f2524b (patch) | |
| tree | 9d7d709c81626ad001cd4fc0154d8093eba9a4a9 /sys/i386/pci | |
| parent | 150c17be5ca68e4694d77b58237821787a94e630 (diff) | |
| download | FreeBSD-src-33b8939d73235aaa07846c64a4cc0f7dd7f2524b.zip FreeBSD-src-33b8939d73235aaa07846c64a4cc0f7dd7f2524b.tar.gz | |
Allow the pir0 device add to fail since pir0 may already exist. This should
fix the panics in device_set_ivars() that people were seeing on boxes with
multiple Host-PCI bridges but not using ACPI.
Diffstat (limited to 'sys/i386/pci')
| -rw-r--r-- | sys/i386/pci/pci_bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/i386/pci/pci_bus.c b/sys/i386/pci/pci_bus.c index 500ca8a..892c173 100644 --- a/sys/i386/pci/pci_bus.c +++ b/sys/i386/pci/pci_bus.c @@ -435,8 +435,8 @@ legacy_pcib_attach(device_t dev) bus = pcib_get_bus(dev); if (pci_pir_probe(bus, 0)) { pir = BUS_ADD_CHILD(device_get_parent(dev), 0, "pir", 0); - KASSERT(pir != NULL, ("could not add pir0 device")); - device_probe_and_attach(pir); + if (pir != NULL) + device_probe_and_attach(pir); } device_add_child(dev, "pci", bus); return bus_generic_attach(dev); |
