Merge remote-tracking branch 'spi/fix/core' into spi-linus
This commit is contained in:
commit
d7124d69a5
|
@ -1209,7 +1209,7 @@ static void spi_pump_messages(struct kthread_work *work)
|
||||||
struct spi_master *master =
|
struct spi_master *master =
|
||||||
container_of(work, struct spi_master, pump_messages);
|
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)
|
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)
|
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);
|
EXPORT_SYMBOL_GPL(spi_sync);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue