diff options
author | Vinod Koul <vinod.koul@intel.com> | 2011-04-06 11:51:12 +0530 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2011-04-06 11:51:12 +0530 |
commit | 8194145dcc9562387d93054a4fcf79438d3c3e40 (patch) | |
tree | 24242c3cba79e79ccac3bc5022be38c46e75581c /drivers/dma/dw_dmac.c | |
parent | 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d (diff) | |
parent | e2142df7ec7184ed4a77ada686bc1eb41075490f (diff) | |
download | op-kernel-dev-8194145dcc9562387d93054a4fcf79438d3c3e40.zip op-kernel-dev-8194145dcc9562387d93054a4fcf79438d3c3e40.tar.gz |
Merge branch 'old_next' into next
Diffstat (limited to 'drivers/dma/dw_dmac.c')
-rw-r--r-- | drivers/dma/dw_dmac.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c index 9c25c7d..b15c32c 100644 --- a/drivers/dma/dw_dmac.c +++ b/drivers/dma/dw_dmac.c @@ -304,6 +304,11 @@ static void dwc_scan_descriptors(struct dw_dma *dw, struct dw_dma_chan *dwc) dev_vdbg(chan2dev(&dwc->chan), "scan_descriptors: llp=0x%x\n", llp); list_for_each_entry_safe(desc, _desc, &dwc->active_list, desc_node) { + /* check first descriptors addr */ + if (desc->txd.phys == llp) + return; + + /* check first descriptors llp */ if (desc->lli.llp == llp) /* This one is currently in progress */ return; |