aboutsummaryrefslogtreecommitdiff
path: root/include/linux/spi
diff options
context:
space:
mode:
authorMark Brown2021-10-14 14:15:46 +0100
committerMark Brown2021-10-14 14:15:46 +0100
commit531558b56be514f7e98b9ea2997b6197ee1af360 (patch)
tree22357ee70631091defe8a0dfe580066fdefa9d00 /include/linux/spi
parentd9c55c95a3eac8536fbc6ef39dee69d3716aeee2 (diff)
parent16a8e2fbb2d49111004efc1c7342e083eafabeb0 (diff)
Merge branch 'spi-5.15' into spi-5.16
Diffstat (limited to 'include/linux/spi')
-rw-r--r--include/linux/spi/spi.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 29e21d49aafc..eb7ac8a1e03c 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -527,6 +527,9 @@ struct spi_controller {
/* I/O mutex */
struct mutex io_mutex;
+ /* Used to avoid adding the same CS twice */
+ struct mutex add_lock;
+
/* lock and mutex for SPI bus locking */
spinlock_t bus_lock_spinlock;
struct mutex bus_lock_mutex;