Skip to content

Commit 1db333d

Browse files
committed
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
2 parents b1a384d + 1a4e53d commit 1db333d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/spi/spi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,10 +1019,10 @@ int spi_map_buf(struct spi_controller *ctlr, struct device *dev,
10191019
int i, ret;
10201020

10211021
if (vmalloced_buf || kmap_buf) {
1022-
desc_len = min_t(int, max_seg_size, PAGE_SIZE);
1022+
desc_len = min_t(unsigned int, max_seg_size, PAGE_SIZE);
10231023
sgs = DIV_ROUND_UP(len + offset_in_page(buf), desc_len);
10241024
} else if (virt_addr_valid(buf)) {
1025-
desc_len = min_t(int, max_seg_size, ctlr->max_dma_len);
1025+
desc_len = min_t(unsigned int, max_seg_size, ctlr->max_dma_len);
10261026
sgs = DIV_ROUND_UP(len, desc_len);
10271027
} else {
10281028
return -EINVAL;

0 commit comments

Comments
 (0)