Merge branch 'for-linus-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / dma / at_xdmac.c

diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c
index b7d7f2d443a140f6e9f1783a89b2723ca02c4bed..7d4e0bcda9af54a6ad22bb4cbfb52ddf9d6746b3 100644 (file)
--- a/drivers/dma/at_xdmac.c
+++ b/drivers/dma/at_xdmac.c
@@ -221,7 +221,6 @@ struct at_xdmac {
        int                     irq;
        struct clk              *clk;
        u32                     save_gim;
-       u32                     save_gs;
        struct dma_pool         *at_xdmac_desc_pool;
        struct at_xdmac_chan    chan[0];
 };
@@ -444,9 +443,8 @@ static struct at_xdmac_desc *at_xdmac_alloc_desc(struct dma_chan *chan,
        struct at_xdmac         *atxdmac = to_at_xdmac(chan->device);
        dma_addr_t              phys;
 
-       desc = dma_pool_alloc(atxdmac->at_xdmac_desc_pool, gfp_flags, &phys);
+       desc = dma_pool_zalloc(atxdmac->at_xdmac_desc_pool, gfp_flags, &phys);
        if (desc) {
-               memset(desc, 0, sizeof(*desc));
                INIT_LIST_HEAD(&desc->descs_list);
                dma_async_tx_descriptor_init(&desc->tx_dma_desc, chan);
                desc->tx_dma_desc.tx_submit = at_xdmac_tx_submit;
@@ -1896,7 +1894,6 @@ static int atmel_xdmac_resume(struct device *dev)
        }
 
        at_xdmac_write(atxdmac, AT_XDMAC_GIE, atxdmac->save_gim);
-       at_xdmac_write(atxdmac, AT_XDMAC_GE, atxdmac->save_gs);
        list_for_each_entry_safe(chan, _chan, &atxdmac->dma.channels, device_node) {
                atchan = to_at_xdmac_chan(chan);
                at_xdmac_chan_write(atchan, AT_XDMAC_CC, atchan->save_cc);