diff options
| author | Mark Brown <broonie@kernel.org> | 2023-10-30 13:20:58 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-10-30 13:20:58 +0000 |
| commit | 1b2e883e1af895b62808b044ac96b77e7c9017b1 (patch) | |
| tree | 5be3c6044108f29e2f027b5e0a70862de35840eb /drivers/spi/spi-npcm-fiu.c | |
| parent | 75223bbea840e125359fc63942b5f93462b474c6 (diff) | |
| parent | c3aa5cb264a38ae9bbcce32abca4c155af0456df (diff) | |
| download | linux-stable-1b2e883e1af895b62808b044ac96b77e7c9017b1.tar.gz linux-stable-1b2e883e1af895b62808b044ac96b77e7c9017b1.tar.bz2 linux-stable-1b2e883e1af895b62808b044ac96b77e7c9017b1.zip | |
spi: Merge up fix
One small fix that didn't seem worth sending before the merge window.
Diffstat (limited to 'drivers/spi/spi-npcm-fiu.c')
| -rw-r--r-- | drivers/spi/spi-npcm-fiu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/spi/spi-npcm-fiu.c b/drivers/spi/spi-npcm-fiu.c index 1a5277ff349f..03db9f016a11 100644 --- a/drivers/spi/spi-npcm-fiu.c +++ b/drivers/spi/spi-npcm-fiu.c @@ -353,8 +353,9 @@ 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; - uma_cfg |= ilog2(op->dummy.buswidth) - << NPCM_FIU_UMA_CFG_DBPCK_SHIFT; + if (op->dummy.nbytes) + uma_cfg |= ilog2(op->dummy.buswidth) + << NPCM_FIU_UMA_CFG_DBPCK_SHIFT; uma_cfg |= ilog2(op->data.buswidth) << NPCM_FIU_UMA_CFG_RDBPCK_SHIFT; uma_cfg |= op->dummy.nbytes << NPCM_FIU_UMA_CFG_DBSIZ_SHIFT; |