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

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

diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c
index 61dc20fd1191b42b0cdcb61d399f1dfcc7e1010e..fcd35e8de83c9d4365a9fc2b9be48c4e7f4da31a 100644 (file)
--- a/drivers/i2c/busses/i2c-qup.c
+++ b/drivers/i2c/busses/i2c-qup.c
@@ -778,7 +778,7 @@ static int qup_i2c_bam_schedule_desc(struct qup_i2c_dev *qup)
                        ret = -EINVAL;
 
                        /* abort TX descriptors */
-                       dmaengine_terminate_all(qup->btx.dma);
+                       dmaengine_terminate_sync(qup->btx.dma);
                        goto desc_err;
                }