Commit 66fd3835 authored by Joe Perches's avatar Joe Perches Committed by Rafael J. Wysocki

ACPI: Fix logging when no pci_irq is allocated

Work around a defect in the printk subsystem introduced by a
logging change.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent cd73018f
...@@ -459,19 +459,19 @@ int acpi_pci_irq_enable(struct pci_dev *dev) ...@@ -459,19 +459,19 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
*/ */
if (gsi < 0) { if (gsi < 0) {
u32 dev_gsi; u32 dev_gsi;
dev_warn(&dev->dev, "PCI INT %c: no GSI", pin_name(pin));
/* Interrupt Line values above 0xF are forbidden */ /* Interrupt Line values above 0xF are forbidden */
if (dev->irq > 0 && (dev->irq <= 0xF) && if (dev->irq > 0 && (dev->irq <= 0xF) &&
(acpi_isa_irq_to_gsi(dev->irq, &dev_gsi) == 0)) { (acpi_isa_irq_to_gsi(dev->irq, &dev_gsi) == 0)) {
printk(" - using ISA IRQ %d\n", dev->irq); dev_warn(&dev->dev, "PCI INT %c: no GSI - using ISA IRQ %d\n",
pin_name(pin), dev->irq);
acpi_register_gsi(&dev->dev, dev_gsi, acpi_register_gsi(&dev->dev, dev_gsi,
ACPI_LEVEL_SENSITIVE, ACPI_LEVEL_SENSITIVE,
ACPI_ACTIVE_LOW); ACPI_ACTIVE_LOW);
return 0;
} else { } else {
printk("\n"); dev_warn(&dev->dev, "PCI INT %c: no GSI\n",
return 0; pin_name(pin));
} }
return 0;
} }
rc = acpi_register_gsi(&dev->dev, gsi, triggering, polarity); rc = acpi_register_gsi(&dev->dev, gsi, triggering, polarity);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment