From a48c0be85dc2ef04f888bd61df901689a66b86bb Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Fri, 5 Sep 2003 03:08:08 +0000 Subject: [PATCH] Whacked out CIS configurations can cause us to not have any child. When such a card is ejected, we'd panic. Instead, just ignore it. I should also add a sanity check in the FUNCID code as well, but this isn't wrong since the check is cheap and happens infrequently. --- sys/dev/pccard/pccard.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c index 055cdfddea6..368560f4d11 100644 --- a/sys/dev/pccard/pccard.c +++ b/sys/dev/pccard/pccard.c @@ -284,14 +284,16 @@ pccard_detach_card(device_t dev) struct pccard_softc *sc = PCCARD_SOFTC(dev); struct pccard_function *pf; struct pccard_config_entry *cfe; + int state; /* * We are running on either the PCCARD socket's event thread * or in user context detaching a device by user request. */ STAILQ_FOREACH(pf, &sc->card.pf_head, pf_list) { - int state = device_get_state(pf->dev); - + if (pf->dev == NULL) + continue; + state = device_get_state(pf->dev); if (state == DS_ATTACHED || state == DS_BUSY) device_detach(pf->dev); if (pf->cfe != NULL)