Commit dd72f9c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-fix-v6-6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fix from Mark Brown:
 "A fix for the npcm-fiu driver in cases where there are no dummy bytes
  during reads"

* tag 'spi-fix-v6-6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: npcm-fiu: Fix UMA reads when dummy.nbytes == 0
parents e1e80380 2ec8b010

drivers/spi/spi-npcm-fiu.c

+3 −2
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ static int npcm_fiu_uma_read(struct spi_mem *mem, 
		uma_cfg |= ilog2(op->cmd.buswidth);

		uma_cfg |= ilog2(op->addr.buswidth)

			<< NPCM_FIU_UMA_CFG_ADBPCK_SHIFT;

		if (op->dummy.nbytes)

			uma_cfg |= ilog2(op->dummy.buswidth)

				<< NPCM_FIU_UMA_CFG_DBPCK_SHIFT;

		uma_cfg |= ilog2(op->data.buswidth)