Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...

[karo-tx-linux.git] / drivers / dma / dma-jz4780.c

diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c
index dade7c47ff18451d23fc416c88768f6e12e457ec..7373b7a555ec3224fa896376b913631e1cefd75a 100644 (file)
--- a/drivers/dma/dma-jz4780.c
+++ b/drivers/dma/dma-jz4780.c
@@ -324,8 +324,10 @@ static struct dma_async_tx_descriptor *jz4780_dma_prep_slave_sg(
                                              sg_dma_address(&sgl[i]),
                                              sg_dma_len(&sgl[i]),
                                              direction);
-               if (err < 0)
+               if (err < 0) {
+                       jz4780_dma_desc_free(&jzchan->desc->vdesc);
                        return NULL;
+               }
 
                desc->desc[i].dcm |= JZ_DMA_DCM_TIE;
 
@@ -368,8 +370,10 @@ static struct dma_async_tx_descriptor *jz4780_dma_prep_dma_cyclic(
        for (i = 0; i < periods; i++) {
                err = jz4780_dma_setup_hwdesc(jzchan, &desc->desc[i], buf_addr,
                                              period_len, direction);
-               if (err < 0)
+               if (err < 0) {
+                       jz4780_dma_desc_free(&jzchan->desc->vdesc);
                        return NULL;
+               }
 
                buf_addr += period_len;
 
@@ -396,7 +400,7 @@ static struct dma_async_tx_descriptor *jz4780_dma_prep_dma_cyclic(
        return vchan_tx_prep(&jzchan->vchan, &desc->vdesc, flags);
 }
 
-struct dma_async_tx_descriptor *jz4780_dma_prep_dma_memcpy(
+static struct dma_async_tx_descriptor *jz4780_dma_prep_dma_memcpy(
        struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
        size_t len, unsigned long flags)
 {