---

yaml --- r: 231571 b: refs/heads/master c: 98838f9 h: refs/heads/master i: 231569: abf0d35 231567: 81b846f v: v3
git-mirror · Jan 5, 2011 · 14cd3a4 · 14cd3a4
1 parent 6996391
commit 14cd3a4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c0bb43bbd02fba0b235f8993d1f175734fa8735
+refs/heads/master: 98838f90d92f6f0abf6d6a99880c0ff3127633b8
diff --git a/trunk/drivers/dma/amba-pl08x.c b/trunk/drivers/dma/amba-pl08x.c
@@ -1560,8 +1560,6 @@ static int pl08x_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
 			pl08x_put_phy_channel(pl08x, plchan->phychan);
 			plchan->phychan = NULL;
 		}
-		/* Stop any pending tasklet */
-		tasklet_disable(&plchan->tasklet);
 		/* Dequeue jobs and free LLIs */
 		if (plchan->at) {
 			pl08x_free_txd(pl08x, plchan->at);