From owner-svn-src-stable-7@FreeBSD.ORG  Sat Jan 23 08:43:11 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9C6D2106566C;
	Sat, 23 Jan 2010 08:43:11 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8C83C8FC15;
	Sat, 23 Jan 2010 08:43:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0N8hBrt052112;
	Sat, 23 Jan 2010 08:43:11 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0N8hB0u052110;
	Sat, 23 Jan 2010 08:43:11 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201001230843.o0N8hB0u052110@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Sat, 23 Jan 2010 08:43:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202875 - stable/7/sys/dev/cxgb
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Jan 2010 08:43:11 -0000

Author: np
Date: Sat Jan 23 08:43:11 2010
New Revision: 202875
URL: http://svn.freebsd.org/changeset/base/202875

Log:
  MFC r202863
  
  Don't forget to release the adapter lock for a no-op.

Modified:
  stable/7/sys/dev/cxgb/cxgb_main.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/cxgb/cxgb_main.c
==============================================================================
--- stable/7/sys/dev/cxgb/cxgb_main.c	Sat Jan 23 08:37:04 2010	(r202874)
+++ stable/7/sys/dev/cxgb/cxgb_main.c	Sat Jan 23 08:43:11 2010	(r202875)
@@ -2061,6 +2061,8 @@ fail:
 			p->if_flags = ifp->if_flags;
 		} else if (ifp->if_drv_flags & IFF_DRV_RUNNING)
 			error = cxgb_uninit_locked(p);
+		else
+			ADAPTER_UNLOCK(sc);
 
 		ADAPTER_LOCK_ASSERT_NOTOWNED(sc);
 		break;