summaryrefslogtreecommitdiff
path: root/drivers/spi/atmel-quadspi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2024-10-07 14:53:15 +0100
committerMark Brown <broonie@kernel.org>2024-10-07 14:53:15 +0100
commitc2a59c892f20379a3e48124a83491a12374cd7e0 (patch)
tree7f280fc4108d8ace769ba2e2368a53d71dcdbe4b /drivers/spi/atmel-quadspi.c
parenteb6c65049a274c37f9b6fdf632843b609a0b8fa8 (diff)
parent8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7b (diff)
spi: 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index b32807629189..91108ddfaef2 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 */