Message ID | 49241AD7.3060201@linux.vnet.ibm.com (mailing list archive) |
---|---|
State | Accepted, archived |
Commit | 4b824de9b18b8d1013e9fc9e4b0f855ced8cac2c |
Headers | show |
On Wed, 2008-11-19 at 11:55 -0200, Adhemerval Zanella wrote: > > Fallowing a Benjamin Herrenschmidt request, I sending you a fix for IRQ > assign for some PCIe devices. This bug affects multiple PCIe devices > including Cadet-E, Squib-E, CISCO 4X SDR IB, and Knox adapters. Thanks for tracking this down ! We'll pick it up. In the future, it would be nice if you could post the patch inline rather than as an attachment (you may want to train via private email to make sure you get the right settings in your mailer to avoid damaging it since some mailers love to mangle patches) and with the appropriate "Signed-off-by:..." line. The patch is correct, Paul, can you pick it up ? Cheers, Ben.
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c index bc1fb27..a11d689 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