# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1107 -> 1.1108 # drivers/acpi/pci_link.c 1.9 -> 1.10 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/09/17 len.brown@intel.com 1.1108 # from 2.6 # acpi_pci_link_get_irq() returns 0 on error, not -ENODEV. (Christophe Saout) # -------------------------------------------- # diff -Nru a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c --- a/drivers/acpi/pci_link.c Tue Sep 23 12:13:25 2003 +++ b/drivers/acpi/pci_link.c Tue Sep 23 12:13:25 2003 @@ -559,10 +559,9 @@ return_VALUE(0); } - if (acpi_pci_link_allocate(link)) { - return -ENODEV; - } - + if (acpi_pci_link_allocate(link)) + return_VALUE(0); + if (!link->irq.active) { ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Link disabled\n")); return_VALUE(0);