svn commit: r225515 - head/sys/dev/cardbus

[John Baldwin]

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);
 	}
 }