---

yaml --- r: 261913 b: refs/heads/master c: 1d2c098 h: refs/heads/master i: 261911: d517551 v: v3
git-mirror · Jun 16, 2011 · 5809cb7 · 5809cb7
1 parent 8f27696
commit 5809cb7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4e0dd7835d12d9765a372b586a5020ac29cc706
+refs/heads/master: 1d2c0980262e70f5643df34493ffd7e608282c16
diff --git a/trunk/drivers/dma/shdma.c b/trunk/drivers/dma/shdma.c
@@ -766,10 +766,8 @@ static void sh_chan_xfer_ld_queue(struct sh_dmae_chan *sh_chan)
 
 	spin_lock_bh(&sh_chan->desc_lock);
 	/* DMA work check */
-	if (dmae_is_busy(sh_chan)) {
-		spin_unlock_bh(&sh_chan->desc_lock);
-		return;
-	}
+	if (dmae_is_busy(sh_chan))
+		goto sh_chan_xfer_ld_queue_end;
 
 	/* Find the first not transferred descriptor */
 	list_for_each_entry(desc, &sh_chan->ld_queue, node)
@@ -783,6 +781,7 @@ static void sh_chan_xfer_ld_queue(struct sh_dmae_chan *sh_chan)
 			break;
 		}
 
+sh_chan_xfer_ld_queue_end:
 	spin_unlock_bh(&sh_chan->desc_lock);
 }