]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
soc: qcom: cmd-db: Fix an error code in cmd_db_dev_probe()
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 28 Feb 2019 05:48:49 +0000 (08:48 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Jan 2020 13:50:35 +0000 (14:50 +0100)
[ 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

index a6f646295f0678d27e8a2526ce6f283b4cff1555..78d73ec587e114ab2bf44636b35936890b7de468 100644 (file)
@@ -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;
        }