From 4e08cdc5f5a0767687f31f1651a8ea59a2ae0e33 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Fri, 12 Nov 2004 00:46:52 +0000 Subject: [PATCH] Don't use aha after calling aha_free. --- sys/dev/aha/aha_isa.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/aha/aha_isa.c b/sys/dev/aha/aha_isa.c index 7215cb069cb..db4634abd09 100644 --- a/sys/dev/aha/aha_isa.c +++ b/sys/dev/aha/aha_isa.c @@ -247,29 +247,29 @@ aha_isa_attach(device_t dev) /* lockfunc */ busdma_lock_mutex, /* lockarg */ &Giant, &aha->parent_dmat) != 0) { - aha_free(aha); bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port); bus_release_resource(dev, SYS_RES_IRQ, aha->irqrid, aha->irq); bus_release_resource(dev, SYS_RES_DRQ, aha->drqrid, aha->drq); + aha_free(aha); return (ENOMEM); } if (aha_init(aha)) { device_printf(dev, "init failed\n"); - aha_free(aha); bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port); bus_release_resource(dev, SYS_RES_IRQ, aha->irqrid, aha->irq); bus_release_resource(dev, SYS_RES_DRQ, aha->drqrid, aha->drq); + aha_free(aha); return (ENOMEM); } error = aha_attach(aha); if (error) { device_printf(dev, "attach failed\n"); - aha_free(aha); bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port); bus_release_resource(dev, SYS_RES_IRQ, aha->irqrid, aha->irq); bus_release_resource(dev, SYS_RES_DRQ, aha->drqrid, aha->drq); + aha_free(aha); return (error); } @@ -277,10 +277,10 @@ aha_isa_attach(device_t dev) &ih); if (error) { device_printf(dev, "Unable to register interrupt handler\n"); - aha_free(aha); bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port); bus_release_resource(dev, SYS_RES_IRQ, aha->irqrid, aha->irq); bus_release_resource(dev, SYS_RES_DRQ, aha->drqrid, aha->drq); + aha_free(aha); return (error); }