PERFORCE change 154128 for review

[Sam Leffler]

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

Change 154128 by sam at 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
 }
 
 /*