lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 585/849] power: reset: at91-reset: check properly the return value of devm_of_iomap
    Date
    From: Claudiu Beznea <claudiu.beznea@microchip.com>

    [ Upstream commit f558c8072c3461b65c12c0068b108f78cebc8246 ]

    devm_of_iomap() returns error code or valid pointer. Check its return
    value with IS_ERR().

    Fixes: bd3127733f2c ("power: reset: at91-reset: use devm_of_iomap")
    Reported-by: Cristian Birsan <cristian.birsan@microchip.com>
    Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
    Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/power/reset/at91-reset.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c
    index 026649409135c..64def79d557a8 100644
    --- a/drivers/power/reset/at91-reset.c
    +++ b/drivers/power/reset/at91-reset.c
    @@ -193,7 +193,7 @@ static int __init at91_reset_probe(struct platform_device *pdev)
    return -ENOMEM;

    reset->rstc_base = devm_of_iomap(&pdev->dev, pdev->dev.of_node, 0, NULL);
    - if (!reset->rstc_base) {
    + if (IS_ERR(reset->rstc_base)) {
    dev_err(&pdev->dev, "Could not map reset controller address\n");
    return -ENODEV;
    }
    @@ -203,7 +203,7 @@ static int __init at91_reset_probe(struct platform_device *pdev)
    for_each_matching_node_and_match(np, at91_ramc_of_match, &match) {
    reset->ramc_lpr = (u32)match->data;
    reset->ramc_base[idx] = devm_of_iomap(&pdev->dev, np, 0, NULL);
    - if (!reset->ramc_base[idx]) {
    + if (IS_ERR(reset->ramc_base[idx])) {
    dev_err(&pdev->dev, "Could not map ram controller address\n");
    of_node_put(np);
    return -ENODEV;
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:13    [W:4.055 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site