lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3

Browse Source 
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2005-08-05 00:31:42 -04:00
parent 5d2a22079c cbfc1bae55
commit 1d492eb413
12 changed files with 81 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/serial/8250_acpi.c
View File

@@ -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;
}