aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/ep93xx_dma.c
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2016-10-02 23:46:03 -0400
committerVinod Koul <vinod.koul@intel.com>2016-10-02 23:46:03 -0400
commit6619f035a64dd44c7238b7341c138a3975d59111 (patch)
treefce47632273afaa50960abb2c60a04bf63e44783 /drivers/dma/ep93xx_dma.c
parent02aa84860c29f3f5a57e959982c811df46a2736c (diff)
parent509cf0b8146c73e6f29bcf732d1af1b1aed5ec01 (diff)
Merge branch 'topic/compile_test' into for-linus
Diffstat (limited to 'drivers/dma/ep93xx_dma.c')
-rw-r--r--drivers/dma/ep93xx_dma.c12
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,
1045 1045
1046 first = NULL; 1046 first = NULL;
1047 for_each_sg(sgl, sg, sg_len, i) { 1047 for_each_sg(sgl, sg, sg_len, i) {
1048 size_t sg_len = sg_dma_len(sg); 1048 size_t len = sg_dma_len(sg);
1049 1049
1050 if (sg_len > DMA_MAX_CHAN_BYTES) { 1050 if (len > DMA_MAX_CHAN_BYTES) {
1051 dev_warn(chan2dev(edmac), "too big transfer size %d\n", 1051 dev_warn(chan2dev(edmac), "too big transfer size %zu\n",
1052 sg_len); 1052 len);
1053 goto fail; 1053 goto fail;
1054 } 1054 }
1055 1055
@@ -1066,7 +1066,7 @@ ep93xx_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
1066 desc->src_addr = edmac->runtime_addr; 1066 desc->src_addr = edmac->runtime_addr;
1067 desc->dst_addr = sg_dma_address(sg); 1067 desc->dst_addr = sg_dma_address(sg);
1068 } 1068 }
1069 desc->size = sg_len; 1069 desc->size = len;
1070 1070
1071 if (!first) 1071 if (!first)
1072 first = desc; 1072 first = desc;
@@ -1123,7 +1123,7 @@ ep93xx_dma_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr,
1123 } 1123 }
1124 1124
1125 if (period_len > DMA_MAX_CHAN_BYTES) { 1125 if (period_len > DMA_MAX_CHAN_BYTES) {
1126 dev_warn(chan2dev(edmac), "too big period length %d\n", 1126 dev_warn(chan2dev(edmac), "too big period length %zu\n",
1127 period_len); 1127 period_len);
1128 return NULL; 1128 return NULL;
1129 } 1129 }