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

Commit 349f0d56 authored by Kenji Kaneshige's avatar Kenji Kaneshige Committed by Len Brown
Browse files

[ACPI] acpi_pci_enable_irq() 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 1f3a6a15

drivers/acpi/pci_irq.c

+8 −1
Original line number Diff line number Diff line
@@ -424,6 +424,7 @@ acpi_pci_irq_enable ( 
	int			edge_level = ACPI_LEVEL_SENSITIVE;

	int			active_high_low = ACPI_ACTIVE_LOW;

	char			*link = NULL;

	int			rc;



	ACPI_FUNCTION_TRACE("acpi_pci_irq_enable");
@@ -475,7 +476,13 @@ acpi_pci_irq_enable ( 
		}

 	}



	dev->irq = acpi_register_gsi(irq, edge_level, active_high_low);

	rc = acpi_register_gsi(irq, edge_level, active_high_low);

	if (rc < 0) {

		printk(KERN_WARNING PREFIX "PCI Interrupt %s[%c]: failed "

		       "to register GSI\n", pci_name(dev), ('A' + pin));

		return_VALUE(rc);

	}

	dev->irq = rc;



	printk(KERN_INFO PREFIX "PCI Interrupt %s[%c] -> ",

		pci_name(dev), 'A' + pin);