OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mailbox: zynqmp-ipi: Fix NULL vs IS_ERR() check in zynqmp_ipi_mbox_probe()

Browse Source 
In case of error, the function devm_ioremap() returns NULL pointer not
ERR_PTR(). So we should check whether the return value of devm_ioremap()
is NULL instead of IS_ERR.

Fixes: 4981b82ba2 ("mailbox: ZynqMP IPI mailbox controller")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
This commit is contained in:
Wei Yongjun 2020-04-29 09:35:03 +00:00 committed by Jassi Brar
parent 9d8ca628c0
commit 445aeeb569
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/mailbox/zynqmp-ipi-mailbox.c
View File

@ -504,10 +504,9 @@ static int zynqmp_ipi_mbox_probe(struct zynqmp_ipi_mbox *ipi_mbox,
mchan->req_buf_size = resource_size(&res); mchan->req_buf_size = resource_size(&res);
mchan->req_buf = devm_ioremap(mdev, res.start, mchan->req_buf = devm_ioremap(mdev, res.start,
mchan->req_buf_size); mchan->req_buf_size);
if (IS_ERR(mchan->req_buf)) { if (!mchan->req_buf) {
dev_err(mdev, "Unable to map IPI buffer I/O memory\n"); dev_err(mdev, "Unable to map IPI buffer I/O memory\n");
ret = PTR_ERR(mchan->req_buf); return -ENOMEM;
return ret;
} }
} else if (ret != -ENODEV) { } else if (ret != -ENODEV) {
dev_err(mdev, "Unmatched resource %s, %d.\n", name, ret); dev_err(mdev, "Unmatched resource %s, %d.\n", name, ret);
@ -520,10 +519,9 @@ static int zynqmp_ipi_mbox_probe(struct zynqmp_ipi_mbox *ipi_mbox,
mchan->resp_buf_size = resource_size(&res); mchan->resp_buf_size = resource_size(&res);
mchan->resp_buf = devm_ioremap(mdev, res.start, mchan->resp_buf = devm_ioremap(mdev, res.start,
mchan->resp_buf_size); mchan->resp_buf_size);
if (IS_ERR(mchan->resp_buf)) { if (!mchan->resp_buf) {
dev_err(mdev, "Unable to map IPI buffer I/O memory\n"); dev_err(mdev, "Unable to map IPI buffer I/O memory\n");
ret = PTR_ERR(mchan->resp_buf); return -ENOMEM;
return ret;
} }
} else if (ret != -ENODEV) { } else if (ret != -ENODEV) {
dev_err(mdev, "Unmatched resource %s.\n", name); dev_err(mdev, "Unmatched resource %s.\n", name);
@ -543,10 +541,9 @@ static int zynqmp_ipi_mbox_probe(struct zynqmp_ipi_mbox *ipi_mbox,
mchan->req_buf_size = resource_size(&res); mchan->req_buf_size = resource_size(&res);
mchan->req_buf = devm_ioremap(mdev, res.start, mchan->req_buf = devm_ioremap(mdev, res.start,
mchan->req_buf_size); mchan->req_buf_size);
if (IS_ERR(mchan->req_buf)) { if (!mchan->req_buf) {
dev_err(mdev, "Unable to map IPI buffer I/O memory\n"); dev_err(mdev, "Unable to map IPI buffer I/O memory\n");
ret = PTR_ERR(mchan->req_buf); return -ENOMEM;
return ret;
} }
} else if (ret != -ENODEV) { } else if (ret != -ENODEV) {
dev_err(mdev, "Unmatched resource %s.\n", name); dev_err(mdev, "Unmatched resource %s.\n", name);
@ -559,10 +556,9 @@ static int zynqmp_ipi_mbox_probe(struct zynqmp_ipi_mbox *ipi_mbox,
mchan->resp_buf_size = resource_size(&res); mchan->resp_buf_size = resource_size(&res);
mchan->resp_buf = devm_ioremap(mdev, res.start, mchan->resp_buf = devm_ioremap(mdev, res.start,
mchan->resp_buf_size); mchan->resp_buf_size);
if (IS_ERR(mchan->resp_buf)) { if (!mchan->resp_buf) {
dev_err(mdev, "Unable to map IPI buffer I/O memory\n"); dev_err(mdev, "Unable to map IPI buffer I/O memory\n");
ret = PTR_ERR(mchan->resp_buf); return -ENOMEM;
return ret;
} }
} else if (ret != -ENODEV) { } else if (ret != -ENODEV) {
dev_err(mdev, "Unmatched resource %s.\n", name); dev_err(mdev, "Unmatched resource %s.\n", name);