diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-10-29 13:26:04 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-10-29 13:26:04 +0800 |
commit | c11a255c622e7a2d312f4080c6ef529dd67b3c38 (patch) | |
tree | c7d36f8014e9da35e4b772cfdc1779ec0449d657 /drivers/base | |
parent | 273daee0be36235886622396eedb618fc5de0213 (diff) | |
parent | 25f89e269f5c5d06594098cc3b1d97554249f3f9 (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/platform.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 176b59f5bc47..ba66330cea67 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -96,7 +96,7 @@ int platform_get_irq(struct platform_device *dev, unsigned int num) int ret; ret = of_irq_get(dev->dev.of_node, num); - if (ret >= 0 || ret == -EPROBE_DEFER) + if (ret > 0 || ret == -EPROBE_DEFER) return ret; } @@ -154,7 +154,7 @@ int platform_get_irq_byname(struct platform_device *dev, const char *name) int ret; ret = of_irq_get_byname(dev->dev.of_node, name); - if (ret >= 0 || ret == -EPROBE_DEFER) + if (ret > 0 || ret == -EPROBE_DEFER) return ret; } |