| Message ID | 20190228054849.GD3253@kadam (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | soc: qcom: cmd-db: Fix an error code in cmd_db_dev_probe() | expand |
On Wed 27 Feb 21:48 PST 2019, Dan Carpenter wrote: > 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> > --- Thanks Dan, picking this up. Regards, Bjorn > 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 c701b3b010f1..f6c3d17b05c7 100644 > --- a/drivers/soc/qcom/cmd-db.c > +++ b/drivers/soc/qcom/cmd-db.c > @@ -248,8 +248,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.17.1 >
diff --git a/drivers/soc/qcom/cmd-db.c b/drivers/soc/qcom/cmd-db.c index c701b3b010f1..f6c3d17b05c7 100644 --- a/drivers/soc/qcom/cmd-db.c +++ b/drivers/soc/qcom/cmd-db.c @@ -248,8 +248,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; }
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> --- drivers/soc/qcom/cmd-db.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)