Skip to content

Commit

Permalink
of: base: Fix phandle argument length mismatch error message
Browse files Browse the repository at this point in the history
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: af3be70 ("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
  • Loading branch information
Baruch Siach authored and Rob Herring committed Jan 8, 2022
1 parent c2abcf3 commit 94a4950
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/of/base.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down

0 comments on commit 94a4950

Please sign in to comment.