summaryrefslogtreecommitdiffstats
path: root/sys/dev/cardbus/cardbus_cis.c
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2011-09-12 15:21:52 +0000
committerjhb <jhb@FreeBSD.org>2011-09-12 15:21:52 +0000
commitc73be1deff65dd32d240d5011cdb8ce0795b446c (patch)
tree2856a065dae89347670a623f141694a63b2cb3e4 /sys/dev/cardbus/cardbus_cis.c
parenta7e546f4a602e2bbca5c3bada85c9ea17b3c0a35 (diff)
downloadFreeBSD-src-c73be1deff65dd32d240d5011cdb8ce0795b446c.zip
FreeBSD-src-c73be1deff65dd32d240d5011cdb8ce0795b446c.tar.gz
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)
Diffstat (limited to 'sys/dev/cardbus/cardbus_cis.c')
-rw-r--r--sys/dev/cardbus/cardbus_cis.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/dev/cardbus/cardbus_cis.c b/sys/dev/cardbus/cardbus_cis.c
index ca1ef4b..5d7704a 100644
--- a/sys/dev/cardbus/cardbus_cis.c
+++ b/sys/dev/cardbus/cardbus_cis.c
@@ -441,6 +441,7 @@ cardbus_read_tuple_finish(device_t cbdev, device_t child, int rid,
{
if (res != CIS_CONFIG_SPACE) {
bus_release_resource(child, SYS_RES_MEMORY, rid, res);
+ bus_delete_resource(child, SYS_RES_MEMORY, rid);
}
}
OpenPOWER on IntegriCloud