i2c: tegra: Always terminate DMA transfer

It is possible that I2C could error out in the middle of DMA transfer and
in this case DMA channel needs to be reset, otherwise a follow up transfer
will fail because DMA channel stays blocked.

Tested-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 1a390e1bff7218ddb76641d573ab99ba2497aff9..3c7c86d4b0e4b43bc230258b24a51cfe5493f02c 100644 (file)
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -1220,11 +1220,12 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
                time_left = tegra_i2c_wait_completion_timeout(
                                i2c_dev, &i2c_dev->dma_complete, xfer_time);
 
+               dmaengine_terminate_sync(i2c_dev->msg_read ?
+                                        i2c_dev->rx_dma_chan :
+                                        i2c_dev->tx_dma_chan);
+
                if (time_left == 0) {
                        dev_err(i2c_dev->dev, "DMA transfer timeout\n");
-                       dmaengine_terminate_sync(i2c_dev->msg_read ?
-                                                i2c_dev->rx_dma_chan :
-                                                i2c_dev->tx_dma_chan);
                        tegra_i2c_init(i2c_dev, true);
                        return -ETIMEDOUT;
                }
@@ -1237,11 +1238,6 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
                        memcpy(i2c_dev->msg_buf, i2c_dev->dma_buf,
                               msg->len);
                }
-
-               if (i2c_dev->msg_err != I2C_ERR_NONE)
-                       dmaengine_synchronize(i2c_dev->msg_read ?
-                                             i2c_dev->rx_dma_chan :
-                                             i2c_dev->tx_dma_chan);
        }
 
        time_left = tegra_i2c_wait_completion_timeout(