From: Baruch Siach baruch@tkos.co.il
[ Upstream commit 94a4950a4acff39b5847cc1fee4f65e160813493 ]
The cell_count field of of_phandle_iterator is the number of cells we expect in the phandle arguments list when cells_name is missing. The error message should show the number of cells we actually see.
Fixes: af3be70a3211 ("of: Improve of_phandle_iterator_next() error message") Cc: Florian Fainelli f.fainelli@gmail.com Signed-off-by: Baruch Siach baruch@tkos.co.il Signed-off-by: Rob Herring robh@kernel.org Link: https://lore.kernel.org/r/96519ac55be90a63fa44afe01480c30d08535465.164088191... Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/of/base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c index 1d667eb730e19..a240211653789 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1366,9 +1366,9 @@ int of_phandle_iterator_next(struct of_phandle_iterator *it) * property data length */ if (it->cur + count > it->list_end) { - pr_err("%pOF: %s = %d found %d\n", + pr_err("%pOF: %s = %d found %td\n", it->parent, it->cells_name, - count, it->cell_count); + count, it->list_end - it->cur); goto err; } }