lkml.org 
[lkml]   [2020]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 184/330] thermal: rcar_thermal: Handle probe error gracefully
    Date
    From: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

    [ Upstream commit 39056e8a989ef52486e063e34b4822b341e47b0e ]

    If the common register memory resource is not available the driver needs
    to fail gracefully to disable PM. Instead of returning the error
    directly store it in ret and use the already existing error path.

    Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
    Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
    Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
    Link: https://lore.kernel.org/r/20200310114709.1483860-1-niklas.soderlund+renesas@ragnatech.se
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/thermal/rcar_thermal.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
    index d0873de718da9..43f0cd2bd0ae6 100644
    --- a/drivers/thermal/rcar_thermal.c
    +++ b/drivers/thermal/rcar_thermal.c
    @@ -526,8 +526,10 @@ static int rcar_thermal_probe(struct platform_device *pdev)
    res = platform_get_resource(pdev, IORESOURCE_MEM,
    mres++);
    common->base = devm_ioremap_resource(dev, res);
    - if (IS_ERR(common->base))
    - return PTR_ERR(common->base);
    + if (IS_ERR(common->base)) {
    + ret = PTR_ERR(common->base);
    + goto error_unregister;
    + }

    idle = 0; /* polling delay is not needed */
    }
    --
    2.25.1
    \
     
     \ /
      Last update: 2022-09-17 16:08    [W:3.366 / U:0.652 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site