From owner-svn-src-user@FreeBSD.ORG  Wed Jun  3 23:58:25 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 486B4106568B;
	Wed,  3 Jun 2009 23:58:25 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 371CC8FC18;
	Wed,  3 Jun 2009 23:58:25 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n53NwP5u071030;
	Wed, 3 Jun 2009 23:58:25 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n53NwPEO071029;
	Wed, 3 Jun 2009 23:58:25 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906032358.n53NwPEO071029@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 3 Jun 2009 23:58:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193416 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Jun 2009 23:58:25 -0000

Author: kmacy
Date: Wed Jun  3 23:58:24 2009
New Revision: 193416
URL: http://svn.freebsd.org/changeset/base/193416

Log:
  don't do teardown if initialization never happened

Modified:
  user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c

Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c	Wed Jun  3 23:47:43 2009	(r193415)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c	Wed Jun  3 23:58:24 2009	(r193416)
@@ -677,7 +677,8 @@ cxgb_free(struct adapter *sc)
 		    sc->msix_regs_res);
 	}
 
-	t3_free_sge_resources(sc);
+	if (sc->flags & FULL_INIT_DONE)
+		t3_free_sge_resources(sc);
 	t3_sge_deinit_sw(sc);
 
 	/*
@@ -1858,10 +1859,12 @@ cxgb_first_init(struct adapter *sc)
 	setup_rss(sc);
 	t3_add_configured_sysctls(sc);
 	ADAPTER_LOCK(sc);
-	sc->flags &= ~INIT_IN_PROGRESS;
 	sc->flags |= FULL_INIT_DONE;
 	ADAPTER_UNLOCK(sc);
 out:
+	ADAPTER_LOCK(sc);
+	sc->flags &= ~INIT_IN_PROGRESS;
+	ADAPTER_UNLOCK(sc);
 	return (err);
 }
 
@@ -1906,10 +1909,12 @@ cxgb_intr_init(struct adapter *sc)
 	}
 
 	ADAPTER_LOCK(sc);
-	sc->flags &= ~INIT_IN_PROGRESS;
 	sc->flags |= INTR_INIT_DONE;
 	ADAPTER_UNLOCK(sc);
 out:
+	ADAPTER_LOCK(sc);
+	sc->flags &= ~INIT_IN_PROGRESS;
+	ADAPTER_UNLOCK(sc);
 	return (err);
 }