diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-03 14:29:16 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-03 14:29:19 +1000 |
| commit | a70d3d18a2d6695c685d392e5ef10957ce73dad7 (patch) | |
| tree | 456bd76f4a1fb9900372dba8abecf1b65f435f52 /drivers/base | |
| parent | d079bd23f738e679e51c3ed3299b96d4e1c0b284 (diff) | |
| parent | 08cf78ed41feaa21017487bad0a5a405c6cede43 (diff) | |
Merge remote-tracking branch 'devicetree/devicetree/next'
Conflicts:
arch/arm/mach-vexpress/platsmp.c
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/platform.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 5b47210889e..9e9227e1762 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -131,9 +131,12 @@ EXPORT_SYMBOL_GPL(platform_get_resource_byname); */ int platform_get_irq_byname(struct platform_device *dev, const char *name) { - struct resource *r = platform_get_resource_byname(dev, IORESOURCE_IRQ, - name); + struct resource *r; + + if (IS_ENABLED(CONFIG_OF_IRQ) && dev->dev.of_node) + return of_irq_get_byname(dev->dev.of_node, name); + r = platform_get_resource_byname(dev, IORESOURCE_IRQ, name); return r ? r->start : -ENXIO; } EXPORT_SYMBOL_GPL(platform_get_irq_byname); |