From 3f9dd9edcb00155dff6a9b7686ce432606296d79 Mon Sep 17 00:00:00 2001 From: nyan Date: Wed, 21 Mar 2007 03:38:37 +0000 Subject: Don't call bus_deactivate_resource() explicitly before calling bus_release_resource(). This is needed for pc98 by upcoming nexus related change. --- sys/dev/sr/if_sr.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'sys/dev/sr') diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c index 1b6b4f3..2711dfe 100644 --- a/sys/dev/sr/if_sr.c +++ b/sys/dev/sr/if_sr.c @@ -568,29 +568,21 @@ sr_deallocate_resources(device_t device) struct sr_hardc *hc = device_get_softc(device); if (hc->res_irq != 0) { - bus_deactivate_resource(device, SYS_RES_IRQ, - hc->rid_irq, hc->res_irq); bus_release_resource(device, SYS_RES_IRQ, hc->rid_irq, hc->res_irq); hc->res_irq = 0; } if (hc->res_ioport != 0) { - bus_deactivate_resource(device, SYS_RES_IOPORT, - hc->rid_ioport, hc->res_ioport); bus_release_resource(device, SYS_RES_IOPORT, hc->rid_ioport, hc->res_ioport); hc->res_ioport = 0; } if (hc->res_memory != 0) { - bus_deactivate_resource(device, SYS_RES_MEMORY, - hc->rid_memory, hc->res_memory); bus_release_resource(device, SYS_RES_MEMORY, hc->rid_memory, hc->res_memory); hc->res_memory = 0; } if (hc->res_plx_memory != 0) { - bus_deactivate_resource(device, SYS_RES_MEMORY, - hc->rid_plx_memory, hc->res_plx_memory); bus_release_resource(device, SYS_RES_MEMORY, hc->rid_plx_memory, hc->res_plx_memory); hc->res_plx_memory = 0; -- cgit v1.1