diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 05:46:03 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 05:46:03 +0200 |
| commit | 6619f035a64dd44c7238b7341c138a3975d59111 (patch) | |
| tree | fce47632273afaa50960abb2c60a04bf63e44783 /drivers/dma/ep93xx_dma.c | |
| parent | dmaengine: virt-dma: move function declarations (diff) | |
| parent | dmaengine: ti-dma-crossbar: enable COMPILE_TEST (diff) | |
| download | linux-6619f035a64dd44c7238b7341c138a3975d59111.tar.xz linux-6619f035a64dd44c7238b7341c138a3975d59111.zip | |
Merge branch 'topic/compile_test' into for-linus
Diffstat (limited to 'drivers/dma/ep93xx_dma.c')
| -rw-r--r-- | drivers/dma/ep93xx_dma.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c index 2ffaca25267e..ca17e8751af2 100644 --- a/drivers/dma/ep93xx_dma.c +++ b/drivers/dma/ep93xx_dma.c @@ -1045,11 +1045,11 @@ ep93xx_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, first = NULL; for_each_sg(sgl, sg, sg_len, i) { - size_t sg_len = sg_dma_len(sg); + size_t len = sg_dma_len(sg); - if (sg_len > DMA_MAX_CHAN_BYTES) { - dev_warn(chan2dev(edmac), "too big transfer size %d\n", - sg_len); + if (len > DMA_MAX_CHAN_BYTES) { + dev_warn(chan2dev(edmac), "too big transfer size %zu\n", + len); goto fail; } @@ -1066,7 +1066,7 @@ ep93xx_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, desc->src_addr = edmac->runtime_addr; desc->dst_addr = sg_dma_address(sg); } - desc->size = sg_len; + desc->size = len; if (!first) first = desc; @@ -1123,7 +1123,7 @@ ep93xx_dma_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr, } if (period_len > DMA_MAX_CHAN_BYTES) { - dev_warn(chan2dev(edmac), "too big period length %d\n", + dev_warn(chan2dev(edmac), "too big period length %zu\n", period_len); return NULL; } |