diff options
| author | Mark Brown <broonie@kernel.org> | 2016-04-04 10:05:45 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-04-04 10:05:45 -0700 |
| commit | d7124d69a519fdbc52e7bb18f8726872122b2a1e (patch) | |
| tree | 8ecf060f8ca2915063be95ee94e937f9c253b3d7 /drivers/spi | |
| parent | 9735a22799b9214d17d3c231fe377fc852f042e9 (diff) | |
| parent | 24c8cd1b081286fd34340f0e1fc68a774a5a775f (diff) | |
| download | linux-d7124d69a519fdbc52e7bb18f8726872122b2a1e.tar.bz2 | |
Merge remote-tracking branch 'spi/fix/core' into spi-linus
Diffstat (limited to 'drivers/spi')
| -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) struct spi_master *master = container_of(work, struct spi_master, pump_messages); - __spi_pump_messages(master, true, false); + __spi_pump_messages(master, true, master->bus_lock_flag); } 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, */ int spi_sync(struct spi_device *spi, struct spi_message *message) { - return __spi_sync(spi, message, 0); + return __spi_sync(spi, message, spi->master->bus_lock_flag); } EXPORT_SYMBOL_GPL(spi_sync); |