diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-10-28 10:44:19 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-10-28 10:44:19 -0700 |
| commit | c302df26cb5bf9f60633785cf5b5ed162a138dfe (patch) | |
| tree | d7e1f042a5a478a616010ff42e27fbf1547eca8e /drivers/base/platform.c | |
| parent | a979feb9e9f1827463f61ad241b198aa7dc27cd3 (diff) | |
| parent | c843445f19f4e6f05b32125d7556958f98033999 (diff) | |
Merge tag 'v4.4.28' into android-4.4.y
This is the 4.4.28 stable release
Diffstat (limited to 'drivers/base/platform.c')
| -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; } |