summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@st.com>2011-03-03 15:47:17 +0530
committerVinod Koul <vinod.koul@intel.com>2011-03-07 01:12:27 +0530
commit569432efa7975f5795efb8142134f5a098942381 (patch)
treea62ccafa3526a7da531b56d2a75c1bc21b3ff05c
parentf336e42f73d93b74fd21bf9176ee6c7ab8b195c5 (diff)
downloadblackbird-op-linux-569432efa7975f5795efb8142134f5a098942381.tar.gz
blackbird-op-linux-569432efa7975f5795efb8142134f5a098942381.zip
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>
-rw-r--r--drivers/dma/dw_dmac.c2
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,
ret = dma_async_is_complete(cookie, last_complete, last_used);
if (ret != DMA_SUCCESS) {
+ spin_lock_bh(&dwc->lock);
dwc_scan_descriptors(to_dw_dma(chan->device), dwc);
+ spin_unlock_bh(&dwc->lock);
last_complete = dwc->completed;
last_used = chan->cookie;
OpenPOWER on IntegriCloud