2 files changed, 17 insertions, 5 deletions

diff --git a/drivers/serial/8250_acpi.c b/drivers/serial/8250_acpi.c
index 6b9ead288517..a802bdce6e5d 100644
--- a/drivers/serial/8250_acpi.c
+++ b/drivers/serial/8250_acpi.c
@@ -47,18 +47,30 @@ static acpi_status acpi_serial_port(struct uart_port *port,
 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;
 }
 
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index e39818a34a07..b745a1b9e835 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -80,7 +80,7 @@ config SERIAL_8250_CS
 config SERIAL_8250_ACPI
         bool "8250/16550 device discovery via ACPI namespace"
         default y if IA64
-        depends on ACPI_BUS && SERIAL_8250
+        depends on ACPI && SERIAL_8250
         ---help---
           If you wish to enable serial port discovery via the ACPI
           namespace, say Y here.  If unsure, say N.