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

Fix (another, more to come) ivar memory leak during driver detach.

Browse Source
This commit is contained in:
Ariff Abdullah 2007-03-17 19:37:09 +00:00
parent fa21517ed8
commit d2ea76fe8f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=167667
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/dev/sound/pci/csa.c
View File

@ -339,23 +339,31 @@ csa_detach(device_t dev)
{
csa_res *resp;
sc_p scp;
struct sndcard_func *func;
int err;
scp = device_get_softc(dev);
resp = &scp->res;
err = 0;
if (scp->midi != NULL)
if (scp->midi != NULL) {
func = device_get_ivars(scp->midi);
err = device_delete_child(dev, scp->midi);
if (err)
return err;
scp->midi = NULL;
if (err != 0)
return err;
if (func != NULL)
free(func, M_DEVBUF);
scp->midi = NULL;
}
if (scp->pcm != NULL)
if (scp->pcm != NULL) {
func = device_get_ivars(scp->pcm);
err = device_delete_child(dev, scp->pcm);
if (err)
return err;
scp->pcm = NULL;
if (err != 0)
return err;
if (func != NULL)
free(func, M_DEVBUF);
scp->pcm = NULL;
}
bus_teardown_intr(dev, resp->irq, scp->ih);
bus_release_resource(dev, SYS_RES_IRQ, resp->irq_rid, resp->irq);