From owner-svn-src-head@FreeBSD.ORG  Sun Mar  1 21:41:34 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0A20FB73;
 Sun,  1 Mar 2015 21:41:34 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E903C9A2;
 Sun,  1 Mar 2015 21:41:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t21LfXEe093246;
 Sun, 1 Mar 2015 21:41:33 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t21LfXvv093245;
 Sun, 1 Mar 2015 21:41:33 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201503012141.t21LfXvv093245@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 1 Mar 2015 21:41:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r279500 - head/sys/dev/ed
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Mar 2015 21:41:34 -0000

Author: imp
Date: Sun Mar  1 21:41:33 2015
New Revision: 279500
URL: https://svnweb.freebsd.org/changeset/base/279500

Log:
  Unlock the main lock before returning rather than after to eliminate
  dead code that shouldn't have been dead.
  
  Reported by: Maxime Villard

Modified:
  head/sys/dev/ed/if_ed_pccard.c

Modified: head/sys/dev/ed/if_ed_pccard.c
==============================================================================
--- head/sys/dev/ed/if_ed_pccard.c	Sun Mar  1 21:24:19 2015	(r279499)
+++ head/sys/dev/ed/if_ed_pccard.c	Sun Mar  1 21:41:33 2015	(r279500)
@@ -1172,8 +1172,8 @@ ed_ifmedia_sts(struct ifnet *ifp, struct
 	sc = ifp->if_softc;
 	ED_LOCK(sc);
 	if (sc->miibus == NULL) {
-		return;
 		ED_UNLOCK(sc);
+		return;
 	}
 
 	mii = device_get_softc(sc->miibus);