diff options
| author | Paul Mackerras | 2008-12-03 10:11:06 +0100 |
|---|---|---|
| committer | Paul Mackerras | 2008-12-03 10:11:06 +0100 |
| commit | 527491885554002837b5742202adc0ab5f536e54 (patch) | |
| tree | 6d9c44776e0b4368eccd414b92b957fac3c5a4c6 /arch/powerpc/kernel/prom_parse.c | |
| parent | Merge branch 'linux-2.6' into next (diff) | |
| parent | powerpc: Fix dma_map_sg() cache flushing on non coherent platforms (diff) | |
| download | kernel-qcow2-linux-527491885554002837b5742202adc0ab5f536e54.tar.gz kernel-qcow2-linux-527491885554002837b5742202adc0ab5f536e54.tar.xz kernel-qcow2-linux-527491885554002837b5742202adc0ab5f536e54.zip | |
Merge branch 'merge'
Diffstat (limited to 'arch/powerpc/kernel/prom_parse.c')
| -rw-r--r-- | arch/powerpc/kernel/prom_parse.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c index 2a1c02c56967..8c1335566089 100644 --- a/arch/powerpc/kernel/prom_parse.c +++ b/arch/powerpc/kernel/prom_parse.c @@ -250,8 +250,11 @@ int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq) * parsing */ dn = pci_device_to_OF_node(pdev); - if (dn) - return of_irq_map_one(dn, 0, out_irq); + if (dn) { + rc = of_irq_map_one(dn, 0, out_irq); + if (!rc) + return rc; + } /* Ok, we don't, time to have fun. Let's start by building up an * interrupt spec. we assume #interrupt-cells is 1, which is standard |