 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_age.c,v 1.22 2009/02/16 09:38:41 cegger Exp $ */
+/*	$NetBSD: if_age.c,v 1.23 2009/02/23 13:39:41 cegger Exp $ */
 /*	$OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $	*/
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice unmodified, this list of conditions, and the following
  *    disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -21,27 +21,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.22 2009/02/16 09:38:41 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.23 2009/02/23 13:39:41 cegger Exp $");
 #include "bpfilter.h"
 #include "vlan.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/endian.h>
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
 #include <sys/kernel.h>
 @@ -172,41 +172,41 @@ age_attach(device_t parent, device_t sel
         default:
 		aprint_error_dev(self, "invalid base address register\n");
 		break;
+	}
 	if (pci_mapreg_map(pa, AGE_PCIR_BAR, memtype, 0, &sc->sc_mem_bt,
 	    &sc->sc_mem_bh, NULL, &sc->sc_mem_size) != 0) {
 		aprint_error_dev(self, "could not map mem space\n");
 		return;
+	}
 	if (pci_intr_map(pa, &ih) != 0) {
 		aprint_error_dev(self, "could not map interrupt\n");
-		return;
+		goto fail;
+	}
 	/*
 	 * Allocate IRQ
 	 */
 	intrstr = pci_intr_string(sc->sc_pct, ih);
 	sc->sc_irq_handle = pci_intr_establish(sc->sc_pct, ih, IPL_NET,
 	    age_intr, sc);
 	if (sc->sc_irq_handle == NULL) {
 		aprint_error_dev(self, "could not establish interrupt");
 		if (intrstr != NULL)
 			aprint_error(" at %s", intrstr);
 		aprint_error("\n");
-		return;
+		goto fail;
+	}
 	aprint_normal_dev(self, "%s\n", intrstr);
 	/* Set PHY address. */
 	sc->age_phyaddr = AGE_PHY_ADDR;
 	/* Reset PHY. */
 	age_phy_reset(sc);
 	/* Reset the ethernet controller. */
 	age_reset(sc);
 	/* Get PCI and chip id/revision. */
 @@ -286,30 +286,35 @@ age_attach(device_t parent, device_t sel
 		ifmedia_set(&sc->sc_miibus.mii_media, IFM_ETHER | IFM_AUTO);
 	if_attach(ifp);
 	ether_ifattach(ifp, sc->sc_enaddr);
 	if (!pmf_device_register(self, NULL, age_resume))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	else
 		pmf_class_network_register(self, ifp);
 	return;
 fail:
 	age_dma_free(sc);
 	if (sc->sc_irq_handle != NULL) {
 		pci_intr_disestablish(sc->sc_pct, sc->sc_irq_handle);
 		sc->sc_irq_handle = NULL;
+	}
 	if (sc->sc_mem_size) {
 		bus_space_unmap(sc->sc_mem_bt, sc->sc_mem_bh, sc->sc_mem_size);
 		sc->sc_mem_size = 0;
+	}
+}
 static int
 age_detach(device_t self, int flags)
+{
 	struct age_softc *sc = device_private(self);
 	struct ifnet *ifp = &sc->sc_ec.ec_if;
 	int s;
 	s = splnet();
 	age_stop(ifp, 0);
 	splx(s);