diff options
| author | jhb <jhb@FreeBSD.org> | 2009-12-30 22:34:26 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2009-12-30 22:34:26 +0000 |
| commit | 168bb475b7c154727912b8f3f3bc07590fe24a76 (patch) | |
| tree | ddfeb4d92b5f176b3ab472073db62e75f773212f /sys/dev/cardbus | |
| parent | 0897bcc8ad66822fea3078e643be9222ad2cd73d (diff) | |
| download | FreeBSD-src-168bb475b7c154727912b8f3f3bc07590fe24a76.zip FreeBSD-src-168bb475b7c154727912b8f3f3bc07590fe24a76.tar.gz | |
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.
Diffstat (limited to 'sys/dev/cardbus')
| -rw-r--r-- | sys/dev/cardbus/cardbus_cis.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/cardbus/cardbus_cis.c b/sys/dev/cardbus/cardbus_cis.c index 781d399..2cfea19 100644 --- a/sys/dev/cardbus/cardbus_cis.c +++ b/sys/dev/cardbus/cardbus_cis.c @@ -530,8 +530,8 @@ cardbus_read_tuple_init(device_t cbdev, device_t child, uint32_t *start, 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); } |
