summaryrefslogtreecommitdiffstats
path: root/include/linux/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2022-10-17 12:47:33 +0100
committerMark Brown <broonie@kernel.org>2022-10-17 12:47:33 +0100
commit77cda4b9710fd88769997859eb3b7033bfe37e40 (patch)
tree413dc1a4ada89fc36505d284a3623048b1a380c8 /include/linux/spi
parent9abf2313adc1ca1b6180c508c25f22f9395cc780 (diff)
parent6a43cd02ddbc597dc9a1f82c1e433f871a2f6f06 (diff)
downloadlinux-stable-77cda4b9710fd88769997859eb3b7033bfe37e40.tar.gz
linux-stable-77cda4b9710fd88769997859eb3b7033bfe37e40.tar.bz2
linux-stable-77cda4b9710fd88769997859eb3b7033bfe37e40.zip
Merge existing fixes from spi/for-6.1 into new branch
Diffstat (limited to 'include/linux/spi')
-rw-r--r--include/linux/spi/spi-mem.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/spi/spi-mem.h b/include/linux/spi/spi-mem.h
index 2ba044d0d5e5..8e984d75f5b6 100644
--- a/include/linux/spi/spi-mem.h
+++ b/include/linux/spi/spi-mem.h
@@ -225,7 +225,7 @@ static inline void *spi_mem_get_drvdata(struct spi_mem *mem)
/**
* struct spi_controller_mem_ops - SPI memory operations
* @adjust_op_size: shrink the data xfer of an operation to match controller's
- * limitations (can be alignment of max RX/TX size
+ * limitations (can be alignment or max RX/TX size
* limitations)
* @supports_op: check if an operation is supported by the controller
* @exec_op: execute a SPI memory operation