summaryrefslogtreecommitdiffstats
path: root/sys/dev/sr
diff options
context:
space:
mode:
authornyan <nyan@FreeBSD.org>2007-03-21 03:38:37 +0000
committernyan <nyan@FreeBSD.org>2007-03-21 03:38:37 +0000
commit3f9dd9edcb00155dff6a9b7686ce432606296d79 (patch)
tree5c965b8611d1f2f75d505701ac1bd411682b8d13 /sys/dev/sr
parent44a4513fbb23c88c7e68606d39119590d7a81382 (diff)
downloadFreeBSD-src-3f9dd9edcb00155dff6a9b7686ce432606296d79.zip
FreeBSD-src-3f9dd9edcb00155dff6a9b7686ce432606296d79.tar.gz
Don't call bus_deactivate_resource() explicitly before calling
bus_release_resource(). This is needed for pc98 by upcoming nexus related change.
Diffstat (limited to 'sys/dev/sr')
-rw-r--r--sys/dev/sr/if_sr.c8
1 files changed, 0 insertions, 8 deletions
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;
OpenPOWER on IntegriCloud