summaryrefslogtreecommitdiffstats
path: root/drivers/of
diff options
context:
space:
mode:
authorWolfram Sang <wsa@kernel.org>2022-09-27 21:33:37 +0200
committerWolfram Sang <wsa@kernel.org>2022-09-27 21:33:37 +0200
commit85f17d677f6c40069287617630f202eb20fcfe36 (patch)
treea0a7de12ddf19068b14124d7a64d79cf697e0710 /drivers/of
parent2dec3a7a7beb23ec11b23986e0e331913d621ff1 (diff)
parentf76349cf41451c5c42a99f18a9163377e4b364ff (diff)
downloadlinux-85f17d677f6c40069287617630f202eb20fcfe36.tar.gz
linux-85f17d677f6c40069287617630f202eb20fcfe36.tar.bz2
linux-85f17d677f6c40069287617630f202eb20fcfe36.zip
Merge branch 'master' into i2c/for-mergewindow
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/fdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 7bc92923104c..1c573e7a60bc 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -314,7 +314,7 @@ static int unflatten_dt_nodes(const void *blob,
for (offset = 0;
offset >= 0 && depth >= initial_depth;
offset = fdt_next_node(blob, offset, &depth)) {
- if (WARN_ON_ONCE(depth >= FDT_MAX_DEPTH))
+ if (WARN_ON_ONCE(depth >= FDT_MAX_DEPTH - 1))
continue;
if (!IS_ENABLED(CONFIG_OF_KOBJ) &&