aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2016-12-01 05:49:03 -0500
committerVinod Koul <vinod.koul@intel.com>2016-12-06 00:15:48 -0500
commitd3f8dc42024b09974a4a1501d4e8852a025f1c15 (patch)
tree31fb638fb6d3c857ca2fb0342dec750ec37df2ce
parentbd2c6636cc59c4626a04d9918953a107f88eaff9 (diff)
dmaengine: at_xdmac: don't restore unsaved status
save_gs is supposed to save the channel status in order to be restored at resume time but it is never updated and is always 0. Anyway, the channel status is updated in the per channel loop later in the resume function. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-rw-r--r--drivers/dma/at_xdmac.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c
index 40287ff92768..7d4e0bcda9af 100644
--- a/drivers/dma/at_xdmac.c
+++ b/drivers/dma/at_xdmac.c
@@ -221,7 +221,6 @@ struct at_xdmac {
221 int irq; 221 int irq;
222 struct clk *clk; 222 struct clk *clk;
223 u32 save_gim; 223 u32 save_gim;
224 u32 save_gs;
225 struct dma_pool *at_xdmac_desc_pool; 224 struct dma_pool *at_xdmac_desc_pool;
226 struct at_xdmac_chan chan[0]; 225 struct at_xdmac_chan chan[0];
227}; 226};
@@ -1895,7 +1894,6 @@ static int atmel_xdmac_resume(struct device *dev)
1895 } 1894 }
1896 1895
1897 at_xdmac_write(atxdmac, AT_XDMAC_GIE, atxdmac->save_gim); 1896 at_xdmac_write(atxdmac, AT_XDMAC_GIE, atxdmac->save_gim);
1898 at_xdmac_write(atxdmac, AT_XDMAC_GE, atxdmac->save_gs);
1899 list_for_each_entry_safe(chan, _chan, &atxdmac->dma.channels, device_node) { 1897 list_for_each_entry_safe(chan, _chan, &atxdmac->dma.channels, device_node) {
1900 atchan = to_at_xdmac_chan(chan); 1898 atchan = to_at_xdmac_chan(chan);
1901 at_xdmac_chan_write(atchan, AT_XDMAC_CC, atchan->save_cc); 1899 at_xdmac_chan_write(atchan, AT_XDMAC_CC, atchan->save_cc);