diff options
| author | imp <imp@FreeBSD.org> | 2006-06-12 03:17:24 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2006-06-12 03:17:24 +0000 |
| commit | b4fa354dd5de7033d53c035afcd9eb57905da5a1 (patch) | |
| tree | a6e0d3be57d3fdd3ec3f4f56138fd64316b18d30 /sys/dev/cardbus | |
| parent | 4485b1a16986b84c8be5b853ac7fbfe7856d82d3 (diff) | |
| download | FreeBSD-src-b4fa354dd5de7033d53c035afcd9eb57905da5a1.zip FreeBSD-src-b4fa354dd5de7033d53c035afcd9eb57905da5a1.tar.gz | |
When we can't parse the CIS, note with a warning that the bogus CIS
was ignored, rather than freaking out. In the past, it wasn't possible
to not parse the CIS, so this changes no behavior.
Diffstat (limited to 'sys/dev/cardbus')
| -rw-r--r-- | sys/dev/cardbus/cardbus.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index 523e1b9..2e3453e 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -192,11 +192,8 @@ cardbus_attach_card(device_t cbdev) dinfo->pci.cfg.dev = child; resource_list_init(&dinfo->pci.resources); device_set_ivars(child, dinfo); - if (cardbus_do_cis(cbdev, child) != 0) { - DEVPRINTF((cbdev, "Can't parse cis\n")); - pci_freecfg((struct pci_devinfo *)dinfo); - continue; - } + if (cardbus_do_cis(cbdev, child) != 0) + DEVPRINTF((cbdev, "Warning: Bogus CIS ignored\n")); pci_cfg_save(dinfo->pci.cfg.dev, &dinfo->pci, 0); pci_cfg_restore(dinfo->pci.cfg.dev, &dinfo->pci); pci_add_resources(cbdev, child, 1, dinfo->mprefetchable); |
