From 10c7b038ff11994ab1f94e2ed40487aed6d9984d Mon Sep 17 00:00:00 2001 From: Heikki Krogerus Date: Thu, 10 Jan 2013 10:53:06 +0200 Subject: [PATCH] --- yaml --- r: 358519 b: refs/heads/master c: a5dbff111cacecd2e79843a51cc86d21d3648af5 h: refs/heads/master i: 358517: ad90cbcfc27a8ed54bdb99322a99db2c60c02084 358515: f8986c087ec8ce09d5463b8290847dd71d1b3181 358511: 61db5876805fcd9112f9fdbdcc80b6b4fad6f59f v: v3 --- [refs] | 2 +- trunk/drivers/dma/dw_dmac.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bbefca17fc2a..ce4796b67815 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23d5f4ec9de43dbc73a42f1483d9339b907c3dff +refs/heads/master: a5dbff111cacecd2e79843a51cc86d21d3648af5 diff --git a/trunk/drivers/dma/dw_dmac.c b/trunk/drivers/dma/dw_dmac.c index 154952abc2e9..28d5f01c350c 100644 --- a/trunk/drivers/dma/dw_dmac.c +++ b/trunk/drivers/dma/dw_dmac.c @@ -1059,7 +1059,7 @@ static int dwc_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, dwc_chan_disable(dw, dwc); - dwc->paused = false; + dwc_chan_resume(dwc); /* active_list entries will end up before queued entries */ list_splice_init(&dwc->queue, &list);