From a323657048f1ef04f9bb36597506bf01aca639b9 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sun, 27 Jun 2004 13:04:19 +0000 Subject: [PATCH] MFp4: Set the bus handle to the bus handle of the resource, not the starting value. This is more pedantically correct (since the handle isn't always identical to the start of the resource) and also doesn't access the innards of struct resource direct (which I forbid in my tree). We need to do this for all resource types, not just ioport. Reviewed by: njl --- sys/dev/acpica/acpi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 7b79995fe22c..286d870d5966 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -891,10 +891,9 @@ acpi_alloc_resource(device_t bus, device_t child, int type, int *rid, if (res == NULL) return (NULL); - /* Copy the bus tag from the pre-allocated resource. */ + /* Copy the bus tag and handle from the pre-allocated resource. */ rman_set_bustag(res, rman_get_bustag(rle->res)); - if (type == SYS_RES_IOPORT) - rman_set_bushandle(res, res->r_start); + rman_set_bushandle(res, rman_get_bushandle(res)); /* If requested, activate the resource using the parent's method. */ if (flags & RF_ACTIVE)