From owner-p4-projects@FreeBSD.ORG  Fri Dec  5 18:36:37 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1CFE3106567A; Fri,  5 Dec 2008 18:36:37 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BE6F91065675
	for <perforce@freebsd.org>; Fri,  5 Dec 2008 18:36:36 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AE38E8FC0A
	for <perforce@freebsd.org>; Fri,  5 Dec 2008 18:36:36 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB5IaaQ0021356
	for <perforce@freebsd.org>; Fri, 5 Dec 2008 18:36:36 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB5Iaaxe021354
	for perforce@freebsd.org; Fri, 5 Dec 2008 18:36:36 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 5 Dec 2008 18:36:36 GMT
Message-Id: <200812051836.mB5Iaaxe021354@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 154128 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Dec 2008 18:36:37 -0000

http://perforce.freebsd.org/chv.cgi?CH=154128

Change 154128 by sam@sam_ebb on 2008/12/05 18:36:04

	handle attach failure properly; kill some old dead code

Affected files ...

.. //depot/projects/vap/sys/arm/xscale/ixp425/if_npe.c#9 edit

Differences ...

==== //depot/projects/vap/sys/arm/xscale/ixp425/if_npe.c#9 (text+ko) ====

@@ -389,9 +389,12 @@
 	ether_ifattach(ifp, eaddr);
 	return 0;
 out:
-	npe_deactivate(dev);
 	if (ifp != NULL)
 		if_free(ifp);
+	NPE_LOCK_DESTROY(sc);
+	npe_deactivate(dev);
+	if (sc->sc_npe != NULL)
+		ixpnpe_detach(sc->sc_npe);
 	return error;
 }
 
@@ -877,13 +880,6 @@
 	bus_generic_detach(sc->sc_dev);
 	if (sc->sc_mii != NULL)
 		device_delete_child(sc->sc_dev, sc->sc_mii);
-#if 0
-	/* XXX sc_ioh and sc_miih */
-	if (sc->mem_res)
-		bus_release_resource(dev, SYS_RES_IOPORT,
-		    rman_get_rid(sc->mem_res), sc->mem_res);
-	sc->mem_res = 0;
-#endif
 }
 
 /*