diff options
| author | Vinod Koul | 2012-04-25 11:58:54 +0200 |
|---|---|---|
| committer | Vinod Koul | 2012-04-25 11:58:54 +0200 |
| commit | 56cbb3dd48623c01e7c589d29da743d486c95a58 (patch) | |
| tree | 66626f63f4effa03d8d5b14f0ea40b834e4195ae /drivers/dma/amba-pl08x.c | |
| parent | dma/amba-pl08x: add support for the Nomadik variant (diff) | |
| parent | dmaengine/amba-pl08x : reset phychan_hold on terminate all (diff) | |
| download | kernel-qcow2-linux-56cbb3dd48623c01e7c589d29da743d486c95a58.tar.gz kernel-qcow2-linux-56cbb3dd48623c01e7c589d29da743d486c95a58.tar.xz kernel-qcow2-linux-56cbb3dd48623c01e7c589d29da743d486c95a58.zip | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/dma/amba-pl08x.c')
| -rw-r--r-- | drivers/dma/amba-pl08x.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index 629250e36d3b..e7d5550266e0 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c @@ -1433,6 +1433,7 @@ static int pl08x_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, * signal */ release_phy_channel(plchan); + plchan->phychan_hold = 0; } /* Dequeue jobs and free LLIs */ if (plchan->at) { |