diff options
| author | Mark Brown <broonie@linaro.org> | 2014-08-01 07:30:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-01 07:30:41 +0100 |
| commit | 7c8edc47eb28041f33b5d2a82c56c1657794c51f (patch) | |
| tree | 02171184029b0d419205615b705415d20b37ba34 /drivers/base | |
| parent | 2517325cd75273dc472cf7fa17617df945cf423d (diff) | |
| parent | 735fbc72bee7f994b4dc42836f7add4b1b2fd8c4 (diff) | |
Merge tag 'v3.14.15' into linux-linaro-lsk-v3.14
This is the 3.14.15 stable release
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); |