diff options
| author | Mark Brown <broonie@kernel.org> | 2016-03-11 08:28:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-11 08:28:20 +0100 |
| commit | a75481ab4a5276770e0fb7e137a4f170b90fc48b (patch) | |
| tree | 9448ee69cceaa94c0dd0d8a538490b69153488c6 /drivers/spi | |
| parent | Merge remote-tracking branch 'spi/topic/core' into spi-next (diff) | |
| parent | spi: respect the maximum segment size of DMA device (diff) | |
| download | linux-a75481ab4a5276770e0fb7e137a4f170b90fc48b.tar.xz linux-a75481ab4a5276770e0fb7e137a4f170b90fc48b.zip | |
Merge remote-tracking branch 'spi/topic/dma' into spi-next
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 0b2bbf144460..89158c639e29 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -702,6 +702,7 @@ static int spi_map_buf(struct spi_master *master, struct device *dev, enum dma_data_direction dir) { const bool vmalloced_buf = is_vmalloc_addr(buf); + unsigned int max_seg_size = dma_get_max_seg_size(dev); int desc_len; int sgs; struct page *vm_page; @@ -710,10 +711,10 @@ static int spi_map_buf(struct spi_master *master, struct device *dev, int i, ret; if (vmalloced_buf) { - desc_len = PAGE_SIZE; + desc_len = min_t(int, max_seg_size, PAGE_SIZE); sgs = DIV_ROUND_UP(len + offset_in_page(buf), desc_len); } else { - desc_len = master->max_dma_len; + desc_len = min_t(int, max_seg_size, master->max_dma_len); sgs = DIV_ROUND_UP(len, desc_len); } @@ -739,7 +740,6 @@ static int spi_map_buf(struct spi_master *master, struct device *dev, sg_set_buf(&sgt->sgl[i], sg_buf, min); } - buf += min; len -= min; } |