Merge branch 'i2c/for-mergewindow' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / i2c / busses / i2c-sh_mobile.c

diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index 2d2e630fd438712f5de581d2319456b23d74de26..db8fa41868146a859b3efc227f1e7b7d28261229 100644 (file)
--- a/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/drivers/i2c/busses/i2c-sh_mobile.c
@@ -458,9 +458,9 @@ static void sh_mobile_i2c_cleanup_dma(struct sh_mobile_i2c_data *pd)
        if (pd->dma_direction == DMA_NONE)
                return;
        else if (pd->dma_direction == DMA_FROM_DEVICE)
-               dmaengine_terminate_all(pd->dma_rx);
+               dmaengine_terminate_sync(pd->dma_rx);
        else if (pd->dma_direction == DMA_TO_DEVICE)
-               dmaengine_terminate_all(pd->dma_tx);
+               dmaengine_terminate_sync(pd->dma_tx);
 
        sh_mobile_i2c_dma_unmap(pd);
 }