lkml.org 
[lkml]   [2021]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 003/178] dmaengine: fsl-dpaa2-qdma: Fix error return code in two functions
    Date
    From: Zhen Lei <thunder.leizhen@huawei.com>

    [ Upstream commit 17866bc6b2ae1c3075c9fe7bcbeb8ea50eb4c3fc ]

    Fix to return a negative error code from the error handling case instead
    of 0, as done elsewhere in the function where it is.

    Fixes: 7fdf9b05c73b ("dmaengine: fsl-dpaa2-qdma: Add NXP dpaa2 qDMA controller driver for Layerscape SoCs")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
    Link: https://lore.kernel.org/r/20210508030056.2027-1-thunder.leizhen@huawei.com
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c b/drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c
    index 4ec909e0b810..4ae057922ef1 100644
    --- a/drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c
    +++ b/drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c
    @@ -332,6 +332,7 @@ static int __cold dpaa2_qdma_setup(struct fsl_mc_device *ls_dev)
    }

    if (priv->dpdmai_attr.version.major > DPDMAI_VER_MAJOR) {
    + err = -EINVAL;
    dev_err(dev, "DPDMAI major version mismatch\n"
    "Found %u.%u, supported version is %u.%u\n",
    priv->dpdmai_attr.version.major,
    @@ -341,6 +342,7 @@ static int __cold dpaa2_qdma_setup(struct fsl_mc_device *ls_dev)
    }

    if (priv->dpdmai_attr.version.minor > DPDMAI_VER_MINOR) {
    + err = -EINVAL;
    dev_err(dev, "DPDMAI minor version mismatch\n"
    "Found %u.%u, supported version is %u.%u\n",
    priv->dpdmai_attr.version.major,
    @@ -475,6 +477,7 @@ static int __cold dpaa2_qdma_dpio_setup(struct dpaa2_qdma_priv *priv)
    ppriv->store =
    dpaa2_io_store_create(DPAA2_QDMA_STORE_SIZE, dev);
    if (!ppriv->store) {
    + err = -ENOMEM;
    dev_err(dev, "dpaa2_io_store_create() failed\n");
    goto err_store;
    }
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-06-21 18:39    [W:4.027 / U:1.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site