diff options
| author | Vinod Koul <vkoul@kernel.org> | 2018-06-04 07:57:59 +0300 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2018-06-04 07:57:59 +0300 |
| commit | 535f29602349f30792f87b8545a5a6f22db66228 (patch) | |
| tree | 37421ca73d6151b72c510a10ea7e775ea953d0f4 /drivers/dma | |
| parent | 75abeb6b7239341462d45b95246a4417ffa60656 (diff) | |
| parent | 9c3655cba0a84bb95c68b0570a060c2bee6ccc2c (diff) | |
| download | linux-535f29602349f30792f87b8545a5a6f22db66228.tar.xz | |
Merge branch 'topic/bam' into for-linus
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/qcom/bam_dma.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/dma/qcom/bam_dma.c b/drivers/dma/qcom/bam_dma.c index d29275b97e84..b1628d5db6d7 100644 --- a/drivers/dma/qcom/bam_dma.c +++ b/drivers/dma/qcom/bam_dma.c @@ -451,6 +451,7 @@ static void bam_reset_channel(struct bam_chan *bchan) /** * bam_chan_init_hw - Initialize channel hardware * @bchan: bam channel + * @dir: DMA transfer direction * * This function resets and initializes the BAM channel */ @@ -665,7 +666,7 @@ static struct dma_async_tx_descriptor *bam_prep_slave_sg(struct dma_chan *chan, remainder = 0; } - async_desc->length += desc->size; + async_desc->length += le16_to_cpu(desc->size); desc++; } while (remainder > 0); } @@ -679,7 +680,7 @@ err_out: /** * bam_dma_terminate_all - terminate all transactions on a channel - * @bchan: bam dma channel + * @chan: bam dma channel * * Dequeues and frees all transactions * No callbacks are done @@ -910,7 +911,8 @@ static enum dma_status bam_tx_status(struct dma_chan *chan, dma_cookie_t cookie, continue; for (i = 0; i < async_desc->num_desc; i++) - residue += async_desc->curr_desc[i].size; + residue += le16_to_cpu( + async_desc->curr_desc[i].size); } } @@ -950,7 +952,7 @@ static void bam_apply_new_config(struct bam_chan *bchan, /** * bam_start_dma - start next transaction - * @bchan - bam dma channel + * @bchan: bam dma channel */ static void bam_start_dma(struct bam_chan *bchan) { |