lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 279/639] soc: qcom: cmd-db: Fix an error code in cmd_db_dev_probe()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit 93b260528020792032e50725383f27a27897bb0f ]

    The memremap() function doesn't return error pointers, it returns NULL.
    This code is returning "ret = PTR_ERR(NULL);" which is success, but it
    should return -ENOMEM.

    Fixes: 312416d9171a ("drivers: qcom: add command DB driver")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Signed-off-by: Andy Gross <andy.gross@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/soc/qcom/cmd-db.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/soc/qcom/cmd-db.c b/drivers/soc/qcom/cmd-db.c
    index a6f646295f067..78d73ec587e11 100644
    --- a/drivers/soc/qcom/cmd-db.c
    +++ b/drivers/soc/qcom/cmd-db.c
    @@ -283,8 +283,8 @@ static int cmd_db_dev_probe(struct platform_device *pdev)
    }

    cmd_db_header = memremap(rmem->base, rmem->size, MEMREMAP_WB);
    - if (IS_ERR_OR_NULL(cmd_db_header)) {
    - ret = PTR_ERR(cmd_db_header);
    + if (!cmd_db_header) {
    + ret = -ENOMEM;
    cmd_db_header = NULL;
    return ret;
    }
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:15    [W:3.981 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site