From: Wei Yongjun <weiyongjun1@huawei.com> To: Dan Williams <dan.j.williams@intel.com>, Vinod Koul <vkoul@kernel.org>, Peter Ujfalusi <peter.ujfalusi@ti.com>, Chuhong Yuan <hslester96@gmail.com>, Arnd Bergmann <arnd@arndb.de>, YueHaibing <yuehaibing@huawei.com> Cc: Wei Yongjun <weiyongjun1@huawei.com>, <dmaengine@vger.kernel.org>, <kernel-janitors@vger.kernel.org> Subject: [PATCH -next] dmaengine: ti: edma: Fix error return code in edma_probe() Date: Thu, 12 Dec 2019 11:46:22 +0000 [thread overview] Message-ID: <20191212114622.127322-1-weiyongjun1@huawei.com> (raw) Fix to return negative error code -ENOMEM from the error handling case instead of 0, as done elsewhere in this function. Fixes: 2a03c1314506 ("dmaengine: ti: edma: add missed operations") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/dma/ti/edma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/dma/ti/edma.c b/drivers/dma/ti/edma.c index 0628ee4bf1b4..03a7f647f7b2 100644 --- a/drivers/dma/ti/edma.c +++ b/drivers/dma/ti/edma.c @@ -2342,8 +2342,10 @@ static int edma_probe(struct platform_device *pdev) ecc->channels_mask = devm_kcalloc(dev, BITS_TO_LONGS(ecc->num_channels), sizeof(unsigned long), GFP_KERNEL); - if (!ecc->slave_chans || !ecc->slot_inuse || !ecc->channels_mask) + if (!ecc->slave_chans || !ecc->slot_inuse || !ecc->channels_mask) { + ret = -ENOMEM; goto err_disable_pm; + } /* Mark all channels available initially */ bitmap_fill(ecc->channels_mask, ecc->num_channels);
WARNING: multiple messages have this Message-ID (diff)
From: Wei Yongjun <weiyongjun1@huawei.com> To: Dan Williams <dan.j.williams@intel.com>, Vinod Koul <vkoul@kernel.org>, Peter Ujfalusi <peter.ujfalusi@ti.com>, Chuhong Yuan <hslester96@gmail.com>, Arnd Bergmann <arnd@arndb.de>, YueHaibing <yuehaibing@huawei.com> Cc: Wei Yongjun <weiyongjun1@huawei.com>, dmaengine@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH -next] dmaengine: ti: edma: Fix error return code in edma_probe() Date: Thu, 12 Dec 2019 11:46:22 +0000 [thread overview] Message-ID: <20191212114622.127322-1-weiyongjun1@huawei.com> (raw) Fix to return negative error code -ENOMEM from the error handling case instead of 0, as done elsewhere in this function. Fixes: 2a03c1314506 ("dmaengine: ti: edma: add missed operations") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/dma/ti/edma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/dma/ti/edma.c b/drivers/dma/ti/edma.c index 0628ee4bf1b4..03a7f647f7b2 100644 --- a/drivers/dma/ti/edma.c +++ b/drivers/dma/ti/edma.c @@ -2342,8 +2342,10 @@ static int edma_probe(struct platform_device *pdev) ecc->channels_mask = devm_kcalloc(dev, BITS_TO_LONGS(ecc->num_channels), sizeof(unsigned long), GFP_KERNEL); - if (!ecc->slave_chans || !ecc->slot_inuse || !ecc->channels_mask) + if (!ecc->slave_chans || !ecc->slot_inuse || !ecc->channels_mask) { + ret = -ENOMEM; goto err_disable_pm; + } /* Mark all channels available initially */ bitmap_fill(ecc->channels_mask, ecc->num_channels);
next reply other threads:[~2019-12-12 11:49 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-12 11:46 Wei Yongjun [this message] 2019-12-12 11:46 ` [PATCH -next] dmaengine: ti: edma: Fix error return code in edma_probe() Wei Yongjun 2019-12-12 11:54 ` Peter Ujfalusi 2019-12-12 11:54 ` Peter Ujfalusi 2019-12-18 6:11 ` Vinod Koul 2019-12-18 6:23 ` Vinod Koul
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191212114622.127322-1-weiyongjun1@huawei.com \ --to=weiyongjun1@huawei.com \ --cc=arnd@arndb.de \ --cc=dan.j.williams@intel.com \ --cc=dmaengine@vger.kernel.org \ --cc=hslester96@gmail.com \ --cc=kernel-janitors@vger.kernel.org \ --cc=peter.ujfalusi@ti.com \ --cc=vkoul@kernel.org \ --cc=yuehaibing@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.