Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7124d69 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/fix/core' into spi-linus

parents 9735a227 24c8cd1b

drivers/spi/spi.c

+2 −2
Original line number Diff line number Diff line
@@ -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);