diff options
Diffstat (limited to 'drivers/spi/spi.c')
-rw-r--r-- | drivers/spi/spi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index de2f2f90d799..0239b45eed92 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c | |||
@@ -1209,7 +1209,7 @@ static void spi_pump_messages(struct kthread_work *work) | |||
1209 | struct spi_master *master = | 1209 | struct spi_master *master = |
1210 | container_of(work, struct spi_master, pump_messages); | 1210 | container_of(work, struct spi_master, pump_messages); |
1211 | 1211 | ||
1212 | __spi_pump_messages(master, true, false); | 1212 | __spi_pump_messages(master, true, master->bus_lock_flag); |
1213 | } | 1213 | } |
1214 | 1214 | ||
1215 | static int spi_init_queue(struct spi_master *master) | 1215 | static int spi_init_queue(struct spi_master *master) |
@@ -2853,7 +2853,7 @@ static int __spi_sync(struct spi_device *spi, struct spi_message *message, | |||
2853 | */ | 2853 | */ |
2854 | int spi_sync(struct spi_device *spi, struct spi_message *message) | 2854 | int spi_sync(struct spi_device *spi, struct spi_message *message) |
2855 | { | 2855 | { |
2856 | return __spi_sync(spi, message, 0); | 2856 | return __spi_sync(spi, message, spi->master->bus_lock_flag); |
2857 | } | 2857 | } |
2858 | EXPORT_SYMBOL_GPL(spi_sync); | 2858 | EXPORT_SYMBOL_GPL(spi_sync); |
2859 | 2859 | ||