Skip to content

Commit d48fcbd

Browse files
committed
Merge tag 'pci-v4.16-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fix from Bjorn Helgaas: "Fix a POWER9/powernv INTx regression from the merge window (Alexey Kardashevskiy)" * tag 'pci-v4.16-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: powerpc/pci: Fix broken INTx configuration via OF
2 parents 9454473 + c591c2e commit d48fcbd

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

arch/powerpc/kernel/pci-common.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,15 +362,16 @@ struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node)
362362
*/
363363
static int pci_read_irq_line(struct pci_dev *pci_dev)
364364
{
365-
unsigned int virq = 0;
365+
int virq;
366366

367367
pr_debug("PCI: Try to map irq for %s...\n", pci_name(pci_dev));
368368

369369
#ifdef DEBUG
370370
memset(&oirq, 0xff, sizeof(oirq));
371371
#endif
372372
/* Try to get a mapping from the device-tree */
373-
if (!of_irq_parse_and_map_pci(pci_dev, 0, 0)) {
373+
virq = of_irq_parse_and_map_pci(pci_dev, 0, 0);
374+
if (virq <= 0) {
374375
u8 line, pin;
375376

376377
/* If that fails, lets fallback to what is in the config

0 commit comments

Comments
 (0)