From f5636854f3fcee3dcb45a9d0122cf099e72615e5 Mon Sep 17 00:00:00 2001 From: Maninder Singh Date: Tue, 26 May 2015 00:40:05 +0530 Subject: dmaengine: pl330: Initialize pl330 for pl330_prep_dma_memcpy after NULL check of pch Currently pch pointer is already dereferenced before NULL check and thus we are getting below warning: warn: variable dereferenced before check 'pch' So initialize struct pl330_dmac *pl330 after NULL check of dma_pl330_chan *pch. Signed-off-by: Maninder Singh Reviewed-by: Vaneet Narang Signed-off-by: Vinod Koul --- drivers/dma/pl330.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'drivers/dma/pl330.c') diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index a7d9d3029b14..7e2714478e45 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -2581,12 +2581,14 @@ pl330_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dst, { struct dma_pl330_desc *desc; struct dma_pl330_chan *pch = to_pchan(chan); - struct pl330_dmac *pl330 = pch->dmac; + struct pl330_dmac *pl330; int burst; if (unlikely(!pch || !len)) return NULL; + pl330 = pch->dmac; + desc = __pl330_prep_dma_memcpy(pch, dst, src, len); if (!desc) return NULL; -- cgit v1.2.3-59-g8ed1b From e5489d5e9031e34d50f03e3d132f392314e74cf1 Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Wed, 3 Jun 2015 21:26:41 +0000 Subject: dmaengine: pl330: fix wording in mcbufsz message The kernel is not trying to increase mcbufsz. It suggests you should try doing so. Also print the calculated required size of mcbufsz. Signed-off-by: Michal Suchanek Reviewed-by: Krzysztof Kozlowski Signed-off-by: Vinod Koul --- drivers/dma/pl330.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/dma/pl330.c') diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index 7e2714478e45..3781f327eedc 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -1424,8 +1424,8 @@ static int pl330_submit_req(struct pl330_thread *thrd, goto xfer_exit; if (ret > pl330->mcbufsz / 2) { - dev_info(pl330->ddma.dev, "%s:%d Trying increasing mcbufsz\n", - __func__, __LINE__); + dev_info(pl330->ddma.dev, "%s:%d Try increasing mcbufsz (%i/%i)\n", + __func__, __LINE__, ret, pl330->mcbufsz / 2); ret = -ENOMEM; goto xfer_exit; } -- cgit v1.2.3-59-g8ed1b