From f337fd28491136c5106a81b46cb01d155c03da08 Mon Sep 17 00:00:00 2001
From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Sat, 30 Apr 2011 16:57:48 +0200
Subject: [PATCH] --- yaml --- r: 252604 b: refs/heads/master c:
 2f432823ec6e693d7b934e805ce1838f41d66ce7 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/dma/at_hdmac.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 703d6282c283..f01783bdc8df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc52a10a048fc1fbe4ffba58c2f0afc79ae0f56f
+refs/heads/master: 2f432823ec6e693d7b934e805ce1838f41d66ce7
diff --git a/trunk/drivers/dma/at_hdmac.c b/trunk/drivers/dma/at_hdmac.c
index 8f50a0fb79e7..65bd52a84bc3 100644
--- a/trunk/drivers/dma/at_hdmac.c
+++ b/trunk/drivers/dma/at_hdmac.c
@@ -472,13 +472,6 @@ static void atc_tasklet(unsigned long data)
 {
 	struct at_dma_chan *atchan = (struct at_dma_chan *)data;
 
-	/* Channel cannot be enabled here */
-	if (atc_chan_is_enabled(atchan)) {
-		dev_err(chan2dev(&atchan->chan_common),
-			"BUG: channel enabled in tasklet\n");
-		return;
-	}
-
 	spin_lock(&atchan->lock);
 	if (test_and_clear_bit(ATC_IS_ERROR, &atchan->status))
 		atc_handle_error(atchan);