projects / people / pmueller / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 2cb7cef9 BS |
1 | Subject: fix IRQ assignment if interrupts property is missing |
| 2 | From: Adhemerval Zanella Neto <azanella@br.ibm.com> | |
| 3 | References: 446610 - LTC50006 | |
| 4 | ||
| 5 | This patch fix the IRQ assign. | |
| 6 | If the code can not get "interrupts" property from PCI OF node, | |
| 7 | it falls back to standard OF parsing. | |
| 8 | ||
| 9 | Signed-off-by: Olaf Hering <olh@suse.de> | |
| 10 | ||
| 11 | --- | |
| 12 | arch/powerpc/kernel/prom_parse.c | 7 +++++-- | |
| 13 | 1 file changed, 5 insertions(+), 2 deletions(-) | |
| 14 | ||
| 15 | --- a/arch/powerpc/kernel/prom_parse.c | |
| 16 | +++ b/arch/powerpc/kernel/prom_parse.c | |
| 17 | @@ -250,8 +250,11 @@ int of_irq_map_pci(struct pci_dev *pdev, | |
| 18 | * parsing | |
| 19 | */ | |
| 20 | dn = pci_device_to_OF_node(pdev); | |
| 21 | - if (dn) | |
| 22 | - return of_irq_map_one(dn, 0, out_irq); | |
| 23 | + if (dn) { | |
| 24 | + rc = of_irq_map_one(dn, 0, out_irq); | |
| 25 | + if (!rc) | |
| 26 | + return rc; | |
| 27 | + } | |
| 28 | ||
| 29 | /* Ok, we don't, time to have fun. Let's start by building up an | |
| 30 | * interrupt spec. we assume #interrupt-cells is 1, which is standard |