diff options
author | Mark Brown <broonie@kernel.org> | 2024-10-07 14:54:21 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2024-10-07 14:54:21 +0100 |
commit | 344190e0347324d95393c561a4b8c8dfa8cd628b (patch) | |
tree | 20d054b028d30ed361fbaeb20f319482e4a8312f /drivers/spi/atmel-quadspi.c | |
parent | e4926ca0189dac2e780d6d3cca92052376fd7f0e (diff) | |
parent | 8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7b (diff) |
ASoC: Merge up v6.12
Fixes build issues with the KVM selftests
Diffstat (limited to 'drivers/spi/atmel-quadspi.c')
-rw-r--r-- | drivers/spi/atmel-quadspi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index 4f288f07e38f..95cdfc28361e 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -377,7 +377,7 @@ static int atmel_qspi_set_cfg(struct atmel_qspi *aq, */ if (!(aq->mr & QSPI_MR_SMM)) { aq->mr |= QSPI_MR_SMM; - atmel_qspi_write(aq->scr, aq, QSPI_MR); + atmel_qspi_write(aq->mr, aq, QSPI_MR); } /* Clear pending interrupts */ |