---

yaml --- r: 262049 b: refs/heads/master c: a62bae9 h: refs/heads/master i: 262047: 489ffd1 v: v3
git-mirror · Jul 26, 2011 · 53facb2 · 53facb2
1 parent 94f7dcf
commit 53facb2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: add56ba711627c223e9e356d9398642abf7fa32d
+refs/heads/master: a62bae98a93e6c4d53b1e6c20715e94b4a5aca3c
diff --git a/trunk/drivers/dma/mxs-dma.c b/trunk/drivers/dma/mxs-dma.c
@@ -537,6 +537,7 @@ static int mxs_dma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
 	switch (cmd) {
 	case DMA_TERMINATE_ALL:
 		mxs_dma_disable_chan(mxs_chan);
+		mxs_dma_reset_chan(mxs_chan);
 		break;
 	case DMA_PAUSE:
 		mxs_dma_pause_chan(mxs_chan);