[PATCH] of_irq_to_resource now returns the virq
authorAndy Fleming <afleming@freescale.com>
Tue, 7 Nov 2006 22:57:22 +0000 (16:57 -0600)
committerPaul Mackerras <paulus@samba.org>
Mon, 13 Nov 2006 03:48:54 +0000 (14:48 +1100)
Mostly this is to allow for error checking (check the return for NO_IRQ)
Added a check that the resource is non-NULL, too.

Signed-off-by: Andrew Fleming <afleming@freescale.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
include/asm-powerpc/prom.h

index 39f04ef96f384401a9914f30a44bb8c8c575fcd0..1fd7a2253e3ad7bcfcb6398ce359b08f8aa1dadb 100644 (file)
@@ -332,10 +332,18 @@ extern int of_irq_map_one(struct device_node *device, int index,
 struct pci_dev;
 extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq);
 
-static inline void of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
+static inline int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
 {
-       r->start = r->end = irq_of_parse_and_map(dev, index);
-       r->flags = IORESOURCE_IRQ;
+       int irq = irq_of_parse_and_map(dev, index);
+
+       /* Only dereference the resource if both the
+        * resource and the irq are valid. */
+       if (r && irq != NO_IRQ) {
+               r->start = r->end = irq;
+               r->flags = IORESOURCE_IRQ;
+       }
+
+       return irq;
 }