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

Commit 8e42ac81 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents bc645099 c37f45b5

drivers/spi/spi.c

+18 −4
Original line number Diff line number Diff line
@@ -539,8 +539,15 @@ static int __spi_map_msg(struct spi_master *master, struct spi_message *msg) 
	if (!master->can_dma)

		return 0;



	if (master->dma_tx)

		tx_dev = master->dma_tx->device->dev;

	else

		tx_dev = &master->dev;



	if (master->dma_rx)

		rx_dev = master->dma_rx->device->dev;

	else

		rx_dev = &master->dev;



	list_for_each_entry(xfer, &msg->transfers, transfer_list) {

		if (!master->can_dma(master, msg->spi, xfer))
@@ -579,8 +586,15 @@ static int __spi_unmap_msg(struct spi_master *master, struct spi_message *msg) 
	if (!master->cur_msg_mapped || !master->can_dma)

		return 0;



	if (master->dma_tx)

		tx_dev = master->dma_tx->device->dev;

	else

		tx_dev = &master->dev;



	if (master->dma_rx)

		rx_dev = master->dma_rx->device->dev;

	else

		rx_dev = &master->dev;



	list_for_each_entry(xfer, &msg->transfers, transfer_list) {

		if (!master->can_dma(master, msg->spi, xfer))