From c317cf48cd032c848ac918d267060b8625ccdb09 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Wed, 30 Nov 2005 21:03:21 -0500 Subject: [PATCH] --- yaml --- r: 19492 b: refs/heads/master c: 378b2556f4e09fa6f87ff0cb5c4395ff28257d02 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/8250_acpi.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 31ea334b603c..f04df4e55e32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c780f964902a8c4e7f702ff3e0a2b754e82b3ca3 +refs/heads/master: 378b2556f4e09fa6f87ff0cb5c4395ff28257d02 diff --git a/trunk/drivers/serial/8250_acpi.c b/trunk/drivers/serial/8250_acpi.c index a802bdce6e5d..36681ba7b033 100644 --- a/trunk/drivers/serial/8250_acpi.c +++ b/trunk/drivers/serial/8250_acpi.c @@ -83,11 +83,11 @@ static acpi_status acpi_serial_resource(struct acpi_resource *res, void *data) status = acpi_resource_to_address64(res, &addr); if (ACPI_SUCCESS(status)) return acpi_serial_mmio(port, &addr); - else if (res->id == ACPI_RSTYPE_IO) + else if (res->type == ACPI_RSTYPE_IO) return acpi_serial_port(port, &res->data.io); - else if (res->id == ACPI_RSTYPE_EXT_IRQ) + else if (res->type == ACPI_RSTYPE_EXT_IRQ) return acpi_serial_ext_irq(port, &res->data.extended_irq); - else if (res->id == ACPI_RSTYPE_IRQ) + else if (res->type == ACPI_RSTYPE_IRQ) return acpi_serial_irq(port, &res->data.irq); return AE_OK; }