From: Kenji Kaneshige This patch adds the error check of acpi_register_gsi() into ACPI based 8250 serial driver. Signed-off-by: Kenji Kaneshige Cc: Signed-off-by: Andrew Morton --- drivers/serial/8250_acpi.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff -puN drivers/serial/8250_acpi.c~acpi_register_gsi-change-acpi-based-8250-driver drivers/serial/8250_acpi.c --- devel/drivers/serial/8250_acpi.c~acpi_register_gsi-change-acpi-based-8250-driver 2005-07-28 11:42:17.000000000 -0700 +++ devel-akpm/drivers/serial/8250_acpi.c 2005-07-28 11:42:17.000000000 -0700 @@ -47,18 +47,30 @@ static acpi_status acpi_serial_port(stru static acpi_status acpi_serial_ext_irq(struct uart_port *port, struct acpi_resource_ext_irq *ext_irq) { - if (ext_irq->number_of_interrupts > 0) - port->irq = acpi_register_gsi(ext_irq->interrupts[0], + int rc; + + if (ext_irq->number_of_interrupts > 0) { + rc = acpi_register_gsi(ext_irq->interrupts[0], ext_irq->edge_level, ext_irq->active_high_low); + if (rc < 0) + return AE_ERROR; + port->irq = rc; + } return AE_OK; } static acpi_status acpi_serial_irq(struct uart_port *port, struct acpi_resource_irq *irq) { - if (irq->number_of_interrupts > 0) - port->irq = acpi_register_gsi(irq->interrupts[0], + int rc; + + if (irq->number_of_interrupts > 0) { + rc = acpi_register_gsi(irq->interrupts[0], irq->edge_level, irq->active_high_low); + if (rc < 0) + return AE_ERROR; + port->irq = rc; + } return AE_OK; } _