p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'spi/fix/dma' into spi-linus

This commit is contained in:
Mark Brown 2014-11-26 19:05:25 +00:00
parent 5d01410fe4 c1aefbdd05
commit 13616c7133
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

@ -615,13 +615,13 @@ static int spi_map_buf(struct spi_master *master, struct device *dev,
sg_free_table(sgt); sg_free_table(sgt);
return -ENOMEM; return -ENOMEM;
} }
sg_buf = page_address(vm_page) + sg_set_page(&sgt->sgl[i], vm_page,
((size_t)buf & ~PAGE_MASK); min, offset_in_page(buf));
} else { } else {
sg_buf = buf; sg_buf = buf;
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;