Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / drivers / of / fdt.c

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index c9b5cac03b361c980a20c888635bbb52093aa573..82967b07f7be7d094870c4bef172bdb9d29adad0 100644 (file)
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -738,9 +738,12 @@ int __init of_scan_flat_dt(int (*it)(unsigned long node,
        const char *pathp;
        int offset, rc = 0, depth = -1;
 
-        for (offset = fdt_next_node(blob, -1, &depth);
-             offset >= 0 && depth >= 0 && !rc;
-             offset = fdt_next_node(blob, offset, &depth)) {
+       if (!blob)
+               return 0;
+
+       for (offset = fdt_next_node(blob, -1, &depth);
+            offset >= 0 && depth >= 0 && !rc;
+            offset = fdt_next_node(blob, offset, &depth)) {
 
                pathp = fdt_get_name(blob, offset, NULL);
                if (*pathp == '/')