diff options
| author | Mark Brown <broonie@linaro.org> | 2014-08-01 07:31:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-01 07:31:03 +0100 |
| commit | 8f6176e27413a7676ee18960d6dab5fd2fe1b727 (patch) | |
| tree | 944c4d2242c0f9e76ef185d308c059b1ce3bb1c8 /drivers/base | |
| parent | a21b99aadbb2cc3504c767a6cfd9cb5a0c5b65ed (diff) | |
| parent | 7c8edc47eb28041f33b5d2a82c56c1657794c51f (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/platform.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 3c51eb0bd659..9dbf4ef2b2a3 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -89,8 +89,13 @@ int platform_get_irq(struct platform_device *dev, unsigned int num) return dev->archdata.irqs[num]; #else struct resource *r; - if (IS_ENABLED(CONFIG_OF_IRQ) && dev->dev.of_node) - return of_irq_get(dev->dev.of_node, num); + if (IS_ENABLED(CONFIG_OF_IRQ) && dev->dev.of_node) { + int ret; + + ret = of_irq_get(dev->dev.of_node, num); + if (ret >= 0 || ret == -EPROBE_DEFER) + return ret; + } r = platform_get_resource(dev, IORESOURCE_IRQ, num); |