From owner-svn-src-stable-8@FreeBSD.ORG  Tue Oct 12 16:23:50 2010
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 72CC910656A6;
	Tue, 12 Oct 2010 16:23:50 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 60A748FC21;
	Tue, 12 Oct 2010 16:23:50 +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 o9CGNo0Q053330;
	Tue, 12 Oct 2010 16:23:50 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9CGNooX053328;
	Tue, 12 Oct 2010 16:23:50 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201010121623.o9CGNooX053328@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 12 Oct 2010 16:23:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213728 - stable/8/sys/dev/ral
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Oct 2010 16:23:50 -0000

Author: jhb
Date: Tue Oct 12 16:23:50 2010
New Revision: 213728
URL: http://svn.freebsd.org/changeset/base/213728

Log:
  MFC 213268:
  If rt2560_bbp_init() fails, don't drop the lock as the callers of
  rt2560_init_locked() expect the lock to be held on return.

Modified:
  stable/8/sys/dev/ral/rt2560.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/ral/rt2560.c
==============================================================================
--- stable/8/sys/dev/ral/rt2560.c	Tue Oct 12 16:09:08 2010	(r213727)
+++ stable/8/sys/dev/ral/rt2560.c	Tue Oct 12 16:23:50 2010	(r213728)
@@ -2667,8 +2667,7 @@ rt2560_init_locked(struct rt2560_softc *
 	RAL_WRITE(sc, RT2560_CSR1, RT2560_HOST_READY);
 
 	if (rt2560_bbp_init(sc) != 0) {
-		rt2560_stop(sc);
-		RAL_UNLOCK(sc);
+		rt2560_stop_locked(sc);
 		return;
 	}