Merge remote-tracking branch 'spi/fix/dma' into spi-linus (13616c71) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/spi/spi.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -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;