Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus

[firefly-linux-kernel-4.4.55.git] / drivers / dma / at_hdmac.c

diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index e2c04dc81e2a903ea13956e872150c40ed8b00e8..c13a3bb0f5943234fac845d3214309a3c754c63a 100644 (file)
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -1569,7 +1569,6 @@ static int at_dma_remove(struct platform_device *pdev)
 
                /* Disable interrupts */
                atc_disable_chan_irq(atdma, chan->chan_id);
-               tasklet_disable(&atchan->tasklet);
 
                tasklet_kill(&atchan->tasklet);
                list_del(&chan->device_node);