Merge remote-tracking branches 'spi/topic/sunxi', 'spi/topic/tegra114', 'spi/topic...

[firefly-linux-kernel-4.4.55.git] / drivers / spi / spi-tegra114.c

diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
index 6be661e4c6e1ec034d4f5d9211a5aab15098d48b..400649595505e874e2b8873e1561a9e33310da56 100644 (file)
--- a/drivers/spi/spi-tegra114.c
+++ b/drivers/spi/spi-tegra114.c
@@ -846,8 +846,8 @@ complete_xfer:
                                        SPI_COMMAND1);
                        tegra_spi_transfer_delay(xfer->delay_usecs);
                        goto exit;
-               } else if (msg->transfers.prev == &xfer->transfer_list) {
-                       /* This is the last transfer in message */
+               } else if (list_is_last(&xfer->transfer_list,
+                                       &msg->transfers)) {
                        if (xfer->cs_change)
                                tspi->cs_control = spi;
                        else {