diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2021-12-30 19:31:52 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-01-27 13:04:20 +0300 |
| commit | dc4e2dbe6171f1c163507164d525a6aa1a1745a2 (patch) | |
| tree | 3921d50b49c1fd7504f9f892209f18239a9f8a65 | |
| parent | 91dcfc658d38ad6e434c8957dc29d157e753d3aa (diff) | |
| download | linux-dc4e2dbe6171f1c163507164d525a6aa1a1745a2.tar.xz | |
of: base: Fix phandle argument length mismatch error message
[ 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>
| -rw-r--r-- | drivers/of/base.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 0ac17256258d..211c4da5abef 100644 --- 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; } } |