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

Only call pccard_function_disable when we have a configured config

Browse Source 
entry.  Otherwise we panic on boot for cards that we can't allocate a
config entry for (my 3.3V wavelan card currently fails thusly).
This commit is contained in:
Warner Losh 2001-11-26 07:14:00 +00:00
parent 7eea743ef8
commit e8cb41d36f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/pccard/pccard.c
View File

@ -223,7 +223,8 @@ pccard_attach_card(device_t dev)
pccard_ccr_read(pf, 0x0C), pccard_ccr_read(pf, 0x0E),
pccard_ccr_read(pf, 0x10), pccard_ccr_read(pf, 0x12)));
} else {
pccard_function_disable(pf);
if (pf->cfe != NULL)
pccard_function_disable(pf);
}
}
if (sc->sc_enabled_count == 0)
@ -247,7 +248,8 @@ pccard_detach_card(device_t dev, int flags)
if (state == DS_ATTACHED || state == DS_BUSY)
device_detach(pf->dev);
pccard_function_disable(pf);
if (pf->cfe != NULL)
pccard_function_disable(pf);
pccard_function_free(pf);
if (pf->dev != NULL)
device_delete_child(dev, pf->dev);
@ -1010,7 +1012,8 @@ pccard_driver_added(device_t dev, driver_t *driver)
pccard_ccr_read(pf, 0x0C), pccard_ccr_read(pf, 0x0E),
pccard_ccr_read(pf, 0x10), pccard_ccr_read(pf, 0x12)));
} else {
pccard_function_disable(pf);
if (pf->cfe != NULL)
pccard_function_disable(pf);
}
}
return;