diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-03-18 12:21:29 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-03-23 16:55:55 -0400 |
commit | a52f07ecd143baee51623b063be5007585748a4f (patch) | |
tree | 2d5b66d1074b412e21026af10dd16fb2a681ff62 /drivers/of/base.c | |
parent | 38e9e21dac33082f0440d24aefb3466bb18bfed6 (diff) |
dt: protect against NULL matches passed to of_match_node()
There are a few use cases where it is convenient to pass NULL to
of_match_node() and have it fail gracefully. The patch adds a null
check to the beginning so taht it does so.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/of/base.c')
-rw-r--r-- | drivers/of/base.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 710b53bfac6d..632ebae7f17a 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c | |||
@@ -496,6 +496,9 @@ EXPORT_SYMBOL(of_find_node_with_property); | |||
496 | const struct of_device_id *of_match_node(const struct of_device_id *matches, | 496 | const struct of_device_id *of_match_node(const struct of_device_id *matches, |
497 | const struct device_node *node) | 497 | const struct device_node *node) |
498 | { | 498 | { |
499 | if (!matches) | ||
500 | return NULL; | ||
501 | |||
499 | while (matches->name[0] || matches->type[0] || matches->compatible[0]) { | 502 | while (matches->name[0] || matches->type[0] || matches->compatible[0]) { |
500 | int match = 1; | 503 | int match = 1; |
501 | if (matches->name[0]) | 504 | if (matches->name[0]) |