Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58e02762 authored by Kenji Kaneshige's avatar Kenji Kaneshige Committed by Len Brown
Browse files

[ACPI] 8250 driver now checks for acpi_register_gsi() errors 



Signed-off-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 71df30f8

drivers/serial/8250_acpi.c

+16 −4
Original line number Diff line number Diff line
@@ -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;

}