of: base: Fix phandle argument length mismatch error message

BugLink: https://bugs.launchpad.net/bugs/1959376
[ 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.1640881913.git.baruch@tkos.co.il
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 0ac17256258d59b94adee28100bd2c2ef7af2d6b..211c4da5abef609993c1bcc29ece453c0f972751 100644 (file)
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1327,9 +1327,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;
                }
        }