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

It turns out that it is easier to not NULL out pccard and cardbus

Browse Source 
device pointers.  They don't change as the children device drivers
come and go.  Rather, check to see if the device is attached where we
would have checked ! NULL.  This solves many asymmetries in the code
that likely could lead to crashes when loading/unloading cbb without
one or more of the expected children's driver not present.
This commit is contained in:
Warner Losh 2007-02-15 07:22:27 +00:00
parent 9d101a9556
commit 21de43a1ec
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/exca/exca.c
View File

@ -780,7 +780,7 @@ exca_insert(struct exca_softc *exca)
void
exca_removal(struct exca_softc *exca)
{
if (exca->pccarddev != NULL)
if (device_is_attached(exca->pccarddev))
CARD_DETACH_CARD(exca->pccarddev);
}

20
sys/dev/pccbb/pccbb.c
View File

@ -431,13 +431,8 @@ cbb_driver_added(device_t brdev, driver_t *driver)
for (tmp = 0; tmp < numdevs; tmp++) {
dev = devlist[tmp];
if (device_get_state(dev) == DS_NOTPRESENT &&
device_probe_and_attach(dev) == 0) {
device_probe_and_attach(dev) == 0)
wake++;
if (strcmp(device_get_name(dev), "cardbus") == 0)
sc->cbdev = dev;
else if (strcmp(device_get_name(dev), "pccard") == 0)
sc->exca[0].pccarddev = dev;
}
}
free(devlist, M_TEMP);
@ -453,11 +448,8 @@ cbb_child_detached(device_t brdev, device_t child)
{
struct cbb_softc *sc = device_get_softc(brdev);
if (child == sc->cbdev)
sc->cbdev = NULL;
else if (child == sc->exca[0].pccarddev)
sc->exca[0].pccarddev = NULL;
else
/* I'm not sure we even need this */
if (child != sc->cbdev && child != sc->exca[0].pccarddev)
device_printf(brdev, "Unknown child detached: %s\n",
device_get_nameunit(child));
}
@ -556,7 +548,7 @@ cbb_insert(struct cbb_softc *sc)
sockevent, sockstate));
if (sockstate & CBB_STATE_R2_CARD) {
if (sc->exca[0].pccarddev) {
if (device_is_attached(sc->exca[0].pccarddev)) {
sc->flags |= CBB_16BIT_CARD;
exca_insert(&sc->exca[0]);
} else {
@ -564,7 +556,7 @@ cbb_insert(struct cbb_softc *sc)
"16-bit card inserted, but no pccard bus.\n");
}
} else if (sockstate & CBB_STATE_CB_CARD) {
if (sc->cbdev != NULL) {
if (device_is_attached(sc->cbdev)) {
sc->flags &= ~CBB_16BIT_CARD;
CARD_ATTACH_CARD(sc->cbdev);
} else {
@ -587,7 +579,7 @@ cbb_removal(struct cbb_softc *sc)
if (sc->flags & CBB_16BIT_CARD) {
exca_removal(&sc->exca[0]);
} else {
if (sc->cbdev != NULL)
if (device_is_attached(sc->cbdev))
CARD_DETACH_CARD(sc->cbdev);
}
cbb_destroy_res(sc);