From 14cd3a4524f5b18920273914a9ba78006d9696e5 Mon Sep 17 00:00:00 2001
From: Russell King - ARM Linux <linux@arm.linux.org.uk>
Date: Mon, 3 Jan 2011 22:32:26 +0000
Subject: [PATCH] --- yaml --- r: 231571 b: refs/heads/master c:
 98838f90d92f6f0abf6d6a99880c0ff3127633b8 h: refs/heads/master i:   231569:
 abf0d35d811b2815f41aa3235fa5ca9a663db6e4   231567:
 81b846f4ddc8159f0615b682f8ab9537c195dc35 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/dma/amba-pl08x.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a66dbd60aec2..a602a0748367 100644
--- 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
index 9a8d44504c6a..4ca1eb122e07 100644
--- 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);