lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 296/563] of: base: Fix phandle argument length mismatch error message
    Date
    From: Baruch Siach <baruch@tkos.co.il>

    [ 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>
    ---
    drivers/of/base.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/of/base.c b/drivers/of/base.c
    index 161a23631472d..60cb9b44d4ecc 100644
    --- a/drivers/of/base.c
    +++ b/drivers/of/base.c
    @@ -1328,9 +1328,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;
    }
    }
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 21:40    [W:2.122 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site