github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 21:45:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

of: base: Fix phandle argument length mismatch error message

Browse Source 
[ Upstream commit 94a4950a4a ]

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: af3be70a32 ("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>
This commit is contained in:
Baruch Siach 2021-12-30 18:31:52 +02:00 committed by Greg Kroah-Hartman
parent e16e836d51
commit b5793aff11
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/of/base.c
View File

@ -1328,9 +1328,9 @@ int of_phandle_iterator_next(struct of_phandle_iterator *it)
* property data length * property data length
*/ */
if (it->cur + count > it->list_end) { 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, it->parent, it->cells_name,
count, it->cell_count); count, it->list_end - it->cur);
goto err; goto err;
} }
} }