Commit 1db333d9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-fix-v5.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fix from Mark Brown:
 "One fix for type conversion issues when working out maximum
  scatter/gather segment sizes.

  It caused problems for some systems where the limits overflow
  due to the type conversion"

* tag 'spi-fix-v5.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: Fix invalid sgs value
parents b1a384d2 1a4e53d2

drivers/spi/spi.c

+2 −2
Original line number Diff line number Diff line
@@ -1019,10 +1019,10 @@ int spi_map_buf(struct spi_controller *ctlr, struct device *dev, 
	int i, ret;



	if (vmalloced_buf || kmap_buf) {

		desc_len = min_t(int, max_seg_size, PAGE_SIZE);

		desc_len = min_t(unsigned int, max_seg_size, PAGE_SIZE);

		sgs = DIV_ROUND_UP(len + offset_in_page(buf), desc_len);

	} else if (virt_addr_valid(buf)) {

		desc_len = min_t(int, max_seg_size, ctlr->max_dma_len);

		desc_len = min_t(unsigned int, max_seg_size, ctlr->max_dma_len);

		sgs = DIV_ROUND_UP(len, desc_len);

	} else {

		return -EINVAL;