From 5809cb7c27d2e2467e75f9e99ba06edcc51a8847 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 16 Jun 2011 05:08:18 +0000 Subject: [PATCH] --- yaml --- r: 261913 b: refs/heads/master c: 1d2c0980262e70f5643df34493ffd7e608282c16 h: refs/heads/master i: 261911: d517551ddf6168caa7fd9d47300edce43c5906ff v: v3 --- [refs] | 2 +- trunk/drivers/dma/shdma.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 370c8296df7f..1981828a13c1 100644 --- 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 index d2fb16d31bb9..3d22eb82289d 100644 --- 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); }