diff options
| author | Jon Medhurst <tixy@linaro.org> | 2016-02-11 09:57:34 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2016-02-11 09:57:34 +0000 |
| commit | fbcb3efd1a525cb9520cde671985eed7ec03627f (patch) | |
| tree | 1a018a7d9056d3967c1f3b2cb55430dfe2e8909c | |
| parent | f96f53632f11ab3337f0f6d4e48fc92c6d84f15a (diff) | |
| parent | db7bdd3eb8f41af14dc5e11293e782cd1e362fdd (diff) | |
Merge branch 'tracking-armlt-fixes' into integration-linux-vexpresslatest-armlt-20160211
| -rw-r--r-- | drivers/dma/pl330.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index 17ee758b419f..08933067e2e4 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -2241,7 +2241,7 @@ pl330_tx_status(struct dma_chan *chan, dma_cookie_t cookie, struct dma_pl330_chan *pch = to_pchan(chan); unsigned int transferred, residual = 0; - ret = dma_cookie_status(chan, cookie, txstate); + return dma_cookie_status(chan, cookie, txstate); if (!txstate) return ret; @@ -2894,7 +2894,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) pd->src_addr_widths = PL330_DMA_BUSWIDTHS; pd->dst_addr_widths = PL330_DMA_BUSWIDTHS; pd->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV); - pd->residue_granularity = DMA_RESIDUE_GRANULARITY_SEGMENT; + pd->residue_granularity = DMA_RESIDUE_GRANULARITY_DESCRIPTOR; ret = dma_async_device_register(pd); if (ret) { |