lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 206/314] mailbox: zynqmp-ipi: Fix NULL vs IS_ERR() check in zynqmp_ipi_mbox_probe()
    Date
    From: Wei Yongjun <weiyongjun1@huawei.com>

    [ Upstream commit 445aeeb569f8d7904f8cf80b7c6826bb651ef80e ]

    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: 4981b82ba2ff ("mailbox: ZynqMP IPI mailbox controller")
    Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
    Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mailbox/zynqmp-ipi-mailbox.c | 20 ++++++++------------
    1 file changed, 8 insertions(+), 12 deletions(-)

    diff --git a/drivers/mailbox/zynqmp-ipi-mailbox.c b/drivers/mailbox/zynqmp-ipi-mailbox.c
    index 86887c9a349a0..f9cc674ba9b76 100644
    --- a/drivers/mailbox/zynqmp-ipi-mailbox.c
    +++ b/drivers/mailbox/zynqmp-ipi-mailbox.c
    @@ -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 = devm_ioremap(mdev, res.start,
    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");
    - ret = PTR_ERR(mchan->req_buf);
    - return ret;
    + return -ENOMEM;
    }
    } else if (ret != -ENODEV) {
    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 = devm_ioremap(mdev, res.start,
    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");
    - ret = PTR_ERR(mchan->resp_buf);
    - return ret;
    + return -ENOMEM;
    }
    } else if (ret != -ENODEV) {
    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 = devm_ioremap(mdev, res.start,
    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");
    - ret = PTR_ERR(mchan->req_buf);
    - return ret;
    + return -ENOMEM;
    }
    } else if (ret != -ENODEV) {
    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 = devm_ioremap(mdev, res.start,
    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");
    - ret = PTR_ERR(mchan->resp_buf);
    - return ret;
    + return -ENOMEM;
    }
    } else if (ret != -ENODEV) {
    dev_err(mdev, "Unmatched resource %s.\n", name);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 23:14    [W:4.072 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site