---

yaml --- r: 252604 b: refs/heads/master c: 2f43282 h: refs/heads/master v: v3
git-mirror · May 2, 2011 · f337fd2 · f337fd2
1 parent 5c9629b
commit f337fd2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git 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
@@ -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);