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

More properly cleanup the iicbus child when deleting it.

Browse Source 
These are from patches by John Wehle, but the commentary has been
updated by me.

Obtained from: ports/multimedia/pvr250, indirectly
This commit is contained in:
Warner Losh 2006-12-05 06:11:10 +00:00
parent a3f452e8d8
commit 6c818b5fa3
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sys/dev/iicbus/iicbb.c
View File

@ -63,10 +63,11 @@ struct iicbb_softc {
device_t iicbus;
};
static int iicbb_probe(device_t);
static int iicbb_attach(device_t);
static void iicbb_child_detached(device_t, device_t);
static int iicbb_detach(device_t);
static int iicbb_print_child(device_t, device_t);
static int iicbb_probe(device_t);
static int iicbb_callback(device_t, int, caddr_t);
static int iicbb_start(device_t, u_char, int);
@ -82,6 +83,7 @@ static device_method_t iicbb_methods[] = {
DEVMETHOD(device_detach, iicbb_detach),
/* bus interface */
DEVMETHOD(bus_child_detached, iicbb_child_detached),
DEVMETHOD(bus_print_child, iicbb_print_child),
/* iicbus interface */
@ -129,15 +131,34 @@ static int
iicbb_detach(device_t dev)
{
struct iicbb_softc *sc = (struct iicbb_softc *)device_get_softc(dev);
device_t child;
if (sc->iicbus) {
bus_generic_detach(dev);
device_delete_child(dev, sc->iicbus);
}
/*
* We need to save child because the detach indirectly causes
* sc->iicbus to be zeroed. Since we added the device
* unconditionally in iicbb_attach, we need to make sure we
* delete it here. See iicbb_child_detached. We need that
* callback in case newbus detached our children w/o detaching
* us (say iicbus is a module and unloaded w/o iicbb being
* unloaded).
*/
child = sc->iicbus;
bus_generic_detach(dev);
if (child)
device_delete_child(dev, child);
return (0);
}
static void
iicbb_child_detached( device_t dev, device_t child )
{
struct iicbb_softc *sc = (struct iicbb_softc *)device_get_softc(dev);
if (child == sc->iicbus)
sc->iicbus = NULL;
}
static int
iicbb_print_child(device_t bus, device_t dev)
{