android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'spi/topic/dma' into spi-next

Browse Source
This commit is contained in:
Mark Brown
2016-03-11 14:28:20 +07:00
parent df9633a780 df88e91bbf
commit a75481ab4a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/spi/spi.c
View File

@ -702,6 +702,7 @@ static int spi_map_buf(struct spi_master *master, struct device *dev,
enum dma_data_direction dir) enum dma_data_direction dir)
{ {
const bool vmalloced_buf = is_vmalloc_addr(buf); const bool vmalloced_buf = is_vmalloc_addr(buf);
unsigned int max_seg_size = dma_get_max_seg_size(dev);
int desc_len; int desc_len;
int sgs; int sgs;
struct page *vm_page; struct page *vm_page;
@ -710,10 +711,10 @@ static int spi_map_buf(struct spi_master *master, struct device *dev,
int i, ret; int i, ret;
if (vmalloced_buf) { 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); sgs = DIV_ROUND_UP(len + offset_in_page(buf), desc_len);
} else { } 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); 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); sg_set_buf(&sgt->sgl[i], sg_buf, min);
} }
buf += min; buf += min;
len -= min; len -= min;
} }