diff options
author | Viresh Kumar <viresh.kumar@st.com> | 2011-03-03 05:17:17 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2011-03-06 14:42:27 -0500 |
commit | 569432efa7975f5795efb8142134f5a098942381 (patch) | |
tree | a62ccafa3526a7da531b56d2a75c1bc21b3ff05c /drivers/dma/dw_dmac.c | |
parent | f336e42f73d93b74fd21bf9176ee6c7ab8b195c5 (diff) |
dw_dmac: Calling dwc_scan_descriptors from dwc_tx_status() after taking lock
Lock must be taken before calling dwc_scan_descriptors, as this may
access/modify shared data and queues. dwc_tx_status wasn't taking lock before
calling this routine. This patch add code that takes lock before calling
dwc_scan_descriptors.
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/dw_dmac.c')
-rw-r--r-- | drivers/dma/dw_dmac.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c index 942b50f57f21..2b0d5e99ae71 100644 --- a/drivers/dma/dw_dmac.c +++ b/drivers/dma/dw_dmac.c | |||
@@ -836,7 +836,9 @@ dwc_tx_status(struct dma_chan *chan, | |||
836 | 836 | ||
837 | ret = dma_async_is_complete(cookie, last_complete, last_used); | 837 | ret = dma_async_is_complete(cookie, last_complete, last_used); |
838 | if (ret != DMA_SUCCESS) { | 838 | if (ret != DMA_SUCCESS) { |
839 | spin_lock_bh(&dwc->lock); | ||
839 | dwc_scan_descriptors(to_dw_dma(chan->device), dwc); | 840 | dwc_scan_descriptors(to_dw_dma(chan->device), dwc); |
841 | spin_unlock_bh(&dwc->lock); | ||
840 | 842 | ||
841 | last_complete = dwc->completed; | 843 | last_complete = dwc->completed; |
842 | last_used = chan->cookie; | 844 | last_used = chan->cookie; |