d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When we can't parse the CIS, note with a warning that the bogus CIS

Browse Source 
was ignored, rather than freaking out.  In the past, it wasn't possible
to not parse the CIS, so this changes no behavior.
This commit is contained in:
Warner Losh 2006-06-12 03:17:24 +00:00
parent 732fefa3ee
commit a63eba960f
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/cardbus/cardbus.c
View File

@ -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);