1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 2390ddb22d60..960ae5bf3ddc 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -612,6 +612,7 @@ struct device_node *of_find_matching_node_and_match(struct device_node *from,
                                         const struct of_device_id **match)
 {
         struct device_node *np;
+        const struct of_device_id *m;
 
         if (match)
                 *match = NULL;
@@ -619,9 +620,10 @@ struct device_node *of_find_matching_node_and_match(struct device_node *from,
         read_lock(&devtree_lock);
         np = from ? from->allnext : of_allnodes;
         for (; np; np = np->allnext) {
-                if (of_match_node(matches, np) && of_node_get(np)) {
+                m = of_match_node(matches, np);
+                if (m && of_node_get(np)) {
                         if (match)
-                                *match = matches;
+                                *match = m;
                         break;
                 }
         }