---

yaml --- r: 299686 b: refs/heads/master c: 88c08a3 h: refs/heads/master v: v3
git-mirror · Apr 25, 2012 · f1afb2a · f1afb2a
1 parent 44112b6
commit f1afb2a
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: c847382838ca503b6c55fb599160146221a2c141
+refs/heads/master: 88c08a3fba9954ce0ec3e1eab07c498a419ad7e3
diff --git a/trunk/drivers/dma/amba-pl08x.c b/trunk/drivers/dma/amba-pl08x.c
@@ -1429,6 +1429,7 @@ static int pl08x_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
 			 * signal
 			 */
 			release_phy_channel(plchan);
+			plchan->phychan_hold = 0;
 		}
 		/* Dequeue jobs and free LLIs */
 		if (plchan->at) {