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

[John Baldwin]

Author: jhb
Date: Wed Dec 30 22:34:26 2009
New Revision: 201286
URL: http://svn.freebsd.org/changeset/base/201286

Log:
  Fix an error case I missed in the previous change so that the CIS resource
  is fully cleaned up if we fail to find the CIS in the devices ROM.

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

Modified: head/sys/dev/cardbus/cardbus_cis.c
==============================================================================
--- head/sys/dev/cardbus/cardbus_cis.c	Wed Dec 30 22:13:01 2009	(r201285)
+++ head/sys/dev/cardbus/cardbus_cis.c	Wed Dec 30 22:34:26 2009	(r201286)
@@ -530,8 +530,8 @@ cardbus_read_tuple_init(device_t cbdev, 
 			    CARDBUS_EXROM_DATA_INDICATOR) & 0x80) != 0) {
 				device_printf(cbdev, "Cannot find CIS in "
 				    "Option ROM\n");
-				bus_release_resource(child, SYS_RES_MEMORY,
-				    *rid, res);
+				cardbus_read_tuple_finish(cbdev, child, *rid,
+				    res);
 				*rid = 0;
 				return (NULL);
 			}