From owner-p4-projects@FreeBSD.ORG  Wed Jan 18 01:10:19 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9119316A422; Wed, 18 Jan 2006 01:10:18 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6A95116A41F
	for <perforce@freebsd.org>; Wed, 18 Jan 2006 01:10:18 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 219BA43D45
	for <perforce@freebsd.org>; Wed, 18 Jan 2006 01:10:18 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0I1AIwK095157
	for <perforce@freebsd.org>; Wed, 18 Jan 2006 01:10:18 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0I1AHJU095154
	for perforce@freebsd.org; Wed, 18 Jan 2006 01:10:17 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 18 Jan 2006 01:10:17 GMT
Message-Id: <200601180110.k0I1AHJU095154@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 89879 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: Wed, 18 Jan 2006 01:10:19 -0000

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

Change 89879 by imp@imp_Speedy on 2006/01/18 01:09:47

	Don't destroy the lock on success.

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/if_ate.c#21 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#21 (text+ko) ====

@@ -209,9 +209,10 @@
 	 */
 	err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE,
 	    ate_intr, sc, &sc->intrhand);
-	if (err)
+	if (err) {
 		ether_ifdetach(ifp);
-	ATE_LOCK_DESTROY(sc);
+		ATE_LOCK_DESTROY(sc);
+	}
 out:;
 	if (err)
 		ate_deactivate(dev);