From owner-svn-src-projects@FreeBSD.ORG  Thu Dec 27 21:14:30 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 4709769F;
 Thu, 27 Dec 2012 21:14:30 +0000 (UTC)
 (envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2B55A8FC08;
 Thu, 27 Dec 2012 21:14:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBRLEUAk058602;
 Thu, 27 Dec 2012 21:14:30 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBRLEUj2058601;
 Thu, 27 Dec 2012 21:14:30 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201212272114.qBRLEUj2058601@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Thu, 27 Dec 2012 21:14:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244751 - projects/altix2/sys/dev/bge
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 21:14:30 -0000

Author: marcel
Date: Thu Dec 27 21:14:29 2012
New Revision: 244751
URL: http://svnweb.freebsd.org/changeset/base/244751

Log:
  Fix error handling when bge_detach() is called from bge_attach()
  and in particular due to DMA setup errors.

Modified:
  projects/altix2/sys/dev/bge/if_bge.c

Modified: projects/altix2/sys/dev/bge/if_bge.c
==============================================================================
--- projects/altix2/sys/dev/bge/if_bge.c	Thu Dec 27 20:59:22 2012	(r244750)
+++ projects/altix2/sys/dev/bge/if_bge.c	Thu Dec 27 21:14:29 2012	(r244751)
@@ -3901,7 +3901,7 @@ bge_detach(device_t dev)
 
 	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);
 	}