mirror of
https://github.com/opnsense/src.git
synced 2026-06-08 16:22:46 -04:00
Add some sanity checking to the pccard insertion case. Whine if the
bridge tries to tell us about a new card when we have one already in the socket.
This commit is contained in:
parent
1bd8f78656
commit
df2f828a8f
1 changed files with 6 additions and 4 deletions
|
|
@ -186,10 +186,10 @@ pccard_attach_card(device_t dev)
|
|||
device_t child;
|
||||
int i;
|
||||
|
||||
/*
|
||||
* this is here so that when socket_enable calls gettype, trt happens
|
||||
*/
|
||||
STAILQ_INIT(&sc->card.pf_head);
|
||||
if (!STAILQ_EMPTY(&sc->card.pf_head)) {
|
||||
if (bootverbose || pccard_debug)
|
||||
device_printf(dev, "Card already inserted.\n");
|
||||
}
|
||||
|
||||
DEVPRINTF((dev, "chip_socket_enable\n"));
|
||||
POWER_ENABLE_SOCKET(device_get_parent(dev), dev);
|
||||
|
|
@ -325,6 +325,7 @@ pccard_detach_card(device_t dev)
|
|||
STAILQ_REMOVE_HEAD(&sc->card.pf_head, pf_list);
|
||||
free(pf, M_DEVBUF);
|
||||
}
|
||||
STAILQ_INIT(&sc->card.pf_head);
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
|
@ -778,6 +779,7 @@ pccard_attach(device_t dev)
|
|||
sc->sc_enabled_count = 0;
|
||||
if ((err = pccard_device_create(sc)) != 0)
|
||||
return (err);
|
||||
STAILQ_INIT(&sc->card.pf_head);
|
||||
return (bus_generic_attach(dev));
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue