From e8cb41d36fe9b0aba725a5d94f40edc1d264a59c Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Mon, 26 Nov 2001 07:14:00 +0000 Subject: [PATCH] Only call pccard_function_disable when we have a configured config 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). --- sys/dev/pccard/pccard.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c index a482e95a64f..4612b40168b 100644 --- a/sys/dev/pccard/pccard.c +++ b/sys/dev/pccard/pccard.c @@ -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;