summaryrefslogtreecommitdiffstats
path: root/drivers/of/base.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-03-18 10:21:29 -0600
committerGrant Likely <grant.likely@secretlab.ca>2011-03-23 14:55:55 -0600
commita52f07ecd143baee51623b063be5007585748a4f (patch)
tree2d5b66d1074b412e21026af10dd16fb2a681ff62 /drivers/of/base.c
parent38e9e21dac33082f0440d24aefb3466bb18bfed6 (diff)
downloadop-kernel-dev-a52f07ecd143baee51623b063be5007585748a4f.zip
op-kernel-dev-a52f07ecd143baee51623b063be5007585748a4f.tar.gz
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.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 710b53b..632ebae 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -496,6 +496,9 @@ EXPORT_SYMBOL(of_find_node_with_property);
const struct of_device_id *of_match_node(const struct of_device_id *matches,
const struct device_node *node)
{
+ if (!matches)
+ return NULL;
+
while (matches->name[0] || matches->type[0] || matches->compatible[0]) {
int match = 1;
if (matches->name[0])
OpenPOWER on IntegriCloud