From 44d07b6d115195352add441a1b92fed681dfb3ca Mon Sep 17 00:00:00 2001
From: Marek Vasut <marex@denx.de>
Date: Sun, 18 Nov 2012 06:25:07 +0100
Subject: [PATCH] --- yaml --- r: 347080 b: refs/heads/master c:
 c35d3cfdbc8d4fb4358a5bc97a334dbdb86e3d69 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/i2c/busses/i2c-mxs.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e46ed6e59398..5149376d2222 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31f313d9bebfc17e48c787c8c36b38662b4134a1
+refs/heads/master: c35d3cfdbc8d4fb4358a5bc97a334dbdb86e3d69
diff --git a/trunk/drivers/i2c/busses/i2c-mxs.c b/trunk/drivers/i2c/busses/i2c-mxs.c
index 286ca1917820..0670da79ee5e 100644
--- a/trunk/drivers/i2c/busses/i2c-mxs.c
+++ b/trunk/drivers/i2c/busses/i2c-mxs.c
@@ -287,12 +287,14 @@ static int mxs_i2c_dma_setup_xfer(struct i2c_adapter *adap,
 select_init_dma_fail:
 	dma_unmap_sg(i2c->dev, &i2c->sg_io[0], 1, DMA_TO_DEVICE);
 select_init_pio_fail:
+	dmaengine_terminate_all(i2c->dmach);
 	return -EINVAL;
 
 /* Write failpath. */
 write_init_dma_fail:
 	dma_unmap_sg(i2c->dev, i2c->sg_io, 2, DMA_TO_DEVICE);
 write_init_pio_fail:
+	dmaengine_terminate_all(i2c->dmach);
 	return -EINVAL;
 }