Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 43ff2dce authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 0adb3285 ce99319a
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -779,8 +779,14 @@ static int spi_map_buf(struct spi_controller *ctlr, struct device *dev,
	for (i = 0; i < sgs; i++) {

		if (vmalloced_buf || kmap_buf) {
			min = min_t(size_t,
				    len, desc_len - offset_in_page(buf));
			/*
			 * Next scatterlist entry size is the minimum between
			 * the desc_len and the remaining buffer length that
			 * fits in a page.
			 */
			min = min_t(size_t, desc_len,
				    min_t(size_t, len,
					  PAGE_SIZE - offset_in_page(buf)));
			if (vmalloced_buf)
				vm_page = vmalloc_to_page(buf);
			else