From owner-svn-src-all@FreeBSD.ORG  Mon Sep 12 15:21:52 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BD9A11065674;
	Mon, 12 Sep 2011 15:21:52 +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 ADD998FC17;
	Mon, 12 Sep 2011 15:21:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8CFLqLM031623;
	Mon, 12 Sep 2011 15:21:52 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8CFLqrC031621;
	Mon, 12 Sep 2011 15:21:52 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201109121521.p8CFLqrC031621@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 12 Sep 2011 15:21:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225515 - head/sys/dev/cardbus
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Sep 2011 15:21:52 -0000

Author: jhb
Date: Mon Sep 12 15:21:52 2011
New Revision: 225515
URL: http://svn.freebsd.org/changeset/base/225515

Log:
  Partially revert 222753: If a CardBus card stores its CIS in a BAR, delete
  the BAR after parsing the CIS.  This forces the resource range to be
  reallocated if the BAR is reused by the device.
  
  Submitted by:	deischen
  Reviewed by:	imp
  Approved by:	re (kib)

Modified:
  head/sys/dev/cardbus/cardbus_cis.c

Modified: head/sys/dev/cardbus/cardbus_cis.c
==============================================================================
--- head/sys/dev/cardbus/cardbus_cis.c	Mon Sep 12 15:13:23 2011	(r225514)
+++ head/sys/dev/cardbus/cardbus_cis.c	Mon Sep 12 15:21:52 2011	(r225515)
@@ -441,6 +441,7 @@ cardbus_read_tuple_finish(device_t cbdev
 {
 	if (res != CIS_CONFIG_SPACE) {
 		bus_release_resource(child, SYS_RES_MEMORY, rid, res);
+		bus_delete_resource(child, SYS_RES_MEMORY, rid);
 	}
 }