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

Commit 19a03680 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/topic/core' into spi-next

parents c9508d4b 98a8f5a0

drivers/spi/spi.c

+1 −1
Original line number Diff line number Diff line
@@ -1001,7 +1001,7 @@ static int spi_init_queue(struct spi_master *master) 
					   dev_name(&master->dev));

	if (IS_ERR(master->kworker_task)) {

		dev_err(&master->dev, "failed to create message pump task\n");

		return -ENOMEM;

		return PTR_ERR(master->kworker_task);

	}

	init_kthread_work(&master->pump_messages, spi_pump_messages);

include/linux/spi/spi.h

+6 −0
Original line number Diff line number Diff line
@@ -1049,4 +1049,10 @@ spi_unregister_device(struct spi_device *spi) 
extern const struct spi_device_id *

spi_get_device_id(const struct spi_device *sdev);



static inline bool

spi_transfer_is_last(struct spi_master *master, struct spi_transfer *xfer)

{

	return list_is_last(&xfer->transfer_list, &master->cur_msg->transfers);

}



#endif /* __LINUX_SPI_H */