lkml.org 
[lkml]   [2022]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 103/475] clocksource/drivers/timer-of: Check return value of of_iomap in timer_of_base_init()
    Date
    From: Guillaume Ranquet <granquet@baylibre.com>

    [ Upstream commit 4467b8bad2401794fb89a0268c8c8257180bf60f ]

    of_base->base can either be iomapped using of_io_request_and_map() or
    of_iomap() depending whether or not an of_base->name has been set.

    Thus check of_base->base against NULL as of_iomap() does not return a
    PTR_ERR() in case of error.

    Fixes: 9aea417afa6b ("clocksource/drivers/timer-of: Don't request the resource by name")
    Signed-off-by: Guillaume Ranquet <granquet@baylibre.com>
    Link: https://lore.kernel.org/r/20220307172656.4836-1-granquet@baylibre.com
    Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/clocksource/timer-of.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/clocksource/timer-of.c b/drivers/clocksource/timer-of.c
    index a3c73e972fce..bf2a6f64ba0c 100644
    --- a/drivers/clocksource/timer-of.c
    +++ b/drivers/clocksource/timer-of.c
    @@ -157,9 +157,9 @@ static __init int timer_of_base_init(struct device_node *np,
    of_base->base = of_base->name ?
    of_io_request_and_map(np, of_base->index, of_base->name) :
    of_iomap(np, of_base->index);
    - if (IS_ERR(of_base->base)) {
    - pr_err("Failed to iomap (%s)\n", of_base->name);
    - return PTR_ERR(of_base->base);
    + if (IS_ERR_OR_NULL(of_base->base)) {
    + pr_err("Failed to iomap (%s:%s)\n", np->name, of_base->name);
    + return of_base->base ? PTR_ERR(of_base->base) : -ENOMEM;
    }

    return 0;
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-14 16:35    [W:2.839 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site