Author: yongari
Date: Thu Jan 24 04:54:53 2013
New Revision: 245870
URL: http://svnweb.freebsd.org/changeset/base/245870

Log:
  bge_attach() can fail before attaching mii(4). So make sure to check
  bge_miibus before detaching mii(4).

Modified:
  head/sys/dev/bge/if_bge.c

Modified: head/sys/dev/bge/if_bge.c
==============================================================================
--- head/sys/dev/bge/if_bge.c   Thu Jan 24 03:33:15 2013        (r245869)
+++ head/sys/dev/bge/if_bge.c   Thu Jan 24 04:54:53 2013        (r245870)
@@ -3899,9 +3899,9 @@ bge_detach(device_t dev)
        if (sc->bge_tq)
                taskqueue_drain(sc->bge_tq, &sc->bge_intr_task);
 
-       if (sc->bge_flags & BGE_FLAG_TBI) {
+       if (sc->bge_flags & BGE_FLAG_TBI)
                ifmedia_removeall(&sc->bge_ifmedia);
-       } else {
+       else if (sc->bge_miibus != NULL) {
                bus_generic_detach(dev);
                device_delete_child(dev, sc->bge_miibus);
        }
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to