From owner-svn-src-projects@FreeBSD.ORG  Tue Apr  2 04:12:17 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id AEF44BC4;
 Tue,  2 Apr 2013 04:12:17 +0000 (UTC)
 (envelope-from cherry@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A0DED65A;
 Tue,  2 Apr 2013 04:12:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r324CHhv038577;
 Tue, 2 Apr 2013 04:12:17 GMT (envelope-from cherry@svn.freebsd.org)
Received: (from cherry@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r324CH8C038576;
 Tue, 2 Apr 2013 04:12:17 GMT (envelope-from cherry@svn.freebsd.org)
Message-Id: <201304020412.r324CH8C038576@svn.freebsd.org>
From: "Cherry G. Mathew" <cherry@FreeBSD.org>
Date: Tue, 2 Apr 2013 04:12:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r248994 - projects/amd64_xen_pv/sys/xen/xenbus
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Apr 2013 04:12:17 -0000

Author: cherry
Date: Tue Apr  2 04:12:17 2013
New Revision: 248994
URL: http://svnweb.freebsd.org/changeset/base/248994

Log:
  Revert r248952
  This was a configuration error rather than a programming bug.
  
  Reviewed and Pointed out by: gibbs@

Modified:
  projects/amd64_xen_pv/sys/xen/xenbus/xenbusb.c

Modified: projects/amd64_xen_pv/sys/xen/xenbus/xenbusb.c
==============================================================================
--- projects/amd64_xen_pv/sys/xen/xenbus/xenbusb.c	Tue Apr  2 00:57:54 2013	(r248993)
+++ projects/amd64_xen_pv/sys/xen/xenbus/xenbusb.c	Tue Apr  2 04:12:17 2013	(r248994)
@@ -594,7 +594,8 @@ xenbusb_release_confighook(struct xenbus
 	KASSERT(xbs->xbs_connecting_children > 0,
 		("Connecting device count error\n"));
 	xbs->xbs_connecting_children--;
-	if ((xbs->xbs_flags & XBS_ATTACH_CH_ACTIVE) != 0) {
+	if (xbs->xbs_connecting_children == 0
+         && (xbs->xbs_flags & XBS_ATTACH_CH_ACTIVE) != 0) {
 		xbs->xbs_flags &= ~XBS_ATTACH_CH_ACTIVE;
 		mtx_unlock(&xbs->xbs_lock);
 		config_intrhook_disestablish(&xbs->xbs_attach_ch);