upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-04-25 08:07:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't leak resources:

Browse source 
Don't leak iospace when irq allocation fails.  (call wi_free())

Call bus_release_resource() with the correct "rid" obtained from
bus_alloc_resource() that's saved in the softc instead of a hardcoded
0.
This commit is contained in:
Alfred Perlstein 2001-04-05 06:56:10 +00:00
parent 2955f0b360
commit 8da738fd11
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sys/dev/wi/if_wi.c
View file

@ -1685,6 +1685,7 @@ wi_alloc(dev, io_rid)
sc->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->irq_rid,
0, ~0, 1, RF_ACTIVE);
if (!sc->irq) {
wi_free(dev);
device_printf(dev, "No irq?!\n");
return (ENXIO);
}
@ -1703,12 +1704,18 @@ static void wi_free(dev)
{
struct wi_softc *sc = device_get_softc(dev);
if (sc->iobase != NULL)
bus_release_resource(dev, SYS_RES_IOPORT, 0, sc->iobase);
if (sc->irq != NULL)
bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irq);
if (sc->mem != NULL)
if (sc->iobase != NULL) {
bus_release_resource(dev, SYS_RES_IOPORT, sc->iobase_rid, sc->iobase);
sc->iobase = NULL;
}
if (sc->irq != NULL) {
bus_release_resource(dev, SYS_RES_IRQ, sc->irq_rid, sc->irq);
sc->irq = NULL;
}
if (sc->mem != NULL) {
bus_release_resource(dev, SYS_RES_MEMORY, sc->mem_rid, sc->mem);
sc->mem = NULL;
}
return;
}