| Message ID | 20191212114622.127322-1-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [-next] dmaengine: ti: edma: Fix error return code in edma_probe() | expand |
On 12/12/2019 13.46, Wei Yongjun wrote: > Fix to return negative error code -ENOMEM from the error handling > case instead of 0, as done elsewhere in this function. Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > > 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); > > > - Péter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
On 12-12-19, 11:46, Wei Yongjun wrote: > Fix to return negative error code -ENOMEM from the error handling > case instead of 0, as done elsewhere in this function. Applied, thanks
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);
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(-)