aboutsummaryrefslogtreecommitdiff
path: root/include/asm-powerpc/prom.h
diff options
context:
space:
mode:
authorAndy Fleming <afleming@freescale.com>2006-11-07 16:57:22 -0600
committerPaul Mackerras <paulus@samba.org>2006-11-13 14:48:54 +1100
commit66a91e9c0ab62ea938afaba7352741d8c554a589 (patch)
tree7fd491c3088f098bb9676bd6d0458db8bc6673c7 /include/asm-powerpc/prom.h
parenta9b14973a8c42b2aecc968851372203c6567e196 (diff)
[PATCH] of_irq_to_resource now returns the virq
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>
Diffstat (limited to 'include/asm-powerpc/prom.h')
-rw-r--r--include/asm-powerpc/prom.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h
index 39f04ef96f3..1fd7a2253e3 100644
--- a/include/asm-powerpc/prom.h
+++ b/include/asm-powerpc/prom.h
@@ -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;
}