Commit 94a4950a authored by Baruch Siach's avatar Baruch Siach Committed by Rob Herring
Browse files

of: base: Fix phandle argument length mismatch error message 



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: af3be70a ("of: Improve of_phandle_iterator_next() error message")
Cc: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarBaruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/96519ac55be90a63fa44afe01480c30d08535465.1640881913.git.baruch@tkos.co.il
parent c2abcf30

drivers/of/base.c

+2 −2
Original line number Diff line number Diff line
@@ -1376,9 +1376,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;

		}

	}