aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/irq.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-11-09 11:59:40 -0500
committerBjorn Helgaas <bhelgaas@google.com>2012-11-09 11:59:40 -0500
commit13a84687092f47a6d67b1b17940eb3127ae888b3 (patch)
tree6d6766e6f7721729f60dd4f72fd93c19f97f2248 /drivers/pci/irq.c
parent8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff)
parent6e965e0d0e1d102c261326b06338d3385ea55f97 (diff)
Merge branch 'pci/misc' into next
* pci/misc: PCI/PM: Add comments for PME poll support for PCIe PCI: Add PLX PCI 9050 workaround for some Meilhaus DAQ cards PCI: Add workaround for PLX PCI 9050 BAR alignment erratum PCI: Convert dev_printk(KERN_<LEVEL> to dev_<level>( x86/PCI: Ignore _SEG on HP xw9300 PCI: Don't touch card regs after runtime suspend D3
Diffstat (limited to 'drivers/pci/irq.c')
-rw-r--r--drivers/pci/irq.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pci/irq.c b/drivers/pci/irq.c
index e5f69a43b1b1..b008cf86b9c3 100644
--- a/drivers/pci/irq.c
+++ b/drivers/pci/irq.c
@@ -14,11 +14,11 @@ static void pci_note_irq_problem(struct pci_dev *pdev, const char *reason)
14{ 14{
15 struct pci_dev *parent = to_pci_dev(pdev->dev.parent); 15 struct pci_dev *parent = to_pci_dev(pdev->dev.parent);
16 16
17 dev_printk(KERN_ERR, &pdev->dev, 17 dev_err(&pdev->dev,
18 "Potentially misrouted IRQ (Bridge %s %04x:%04x)\n", 18 "Potentially misrouted IRQ (Bridge %s %04x:%04x)\n",
19 dev_name(&parent->dev), parent->vendor, parent->device); 19 dev_name(&parent->dev), parent->vendor, parent->device);
20 dev_printk(KERN_ERR, &pdev->dev, "%s\n", reason); 20 dev_err(&pdev->dev, "%s\n", reason);
21 dev_printk(KERN_ERR, &pdev->dev, "Please report to linux-kernel@vger.kernel.org\n"); 21 dev_err(&pdev->dev, "Please report to linux-kernel@vger.kernel.org\n");
22 WARN_ON(1); 22 WARN_ON(1);
23} 23}
24 24