Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3e8230c authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/tasklet_fix' into for-linus

parents 975faaeb 9068b032

drivers/dma/at_hdmac.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

drivers/dma/pch_dma.c

+2 −2
Original line number Diff line number Diff line
@@ -964,16 +964,16 @@ static void pch_dma_remove(struct pci_dev *pdev) 
	if (pd) {

		dma_async_device_unregister(&pd->dma);



		free_irq(pdev->irq, pd);



		list_for_each_entry_safe(chan, _c, &pd->dma.channels,

					 device_node) {

			pd_chan = to_pd_chan(chan);



			tasklet_disable(&pd_chan->tasklet);

			tasklet_kill(&pd_chan->tasklet);

		}



		pci_pool_destroy(pd->pool);

		free_irq(pdev->irq, pd);

		pci_iounmap(pdev, pd->membase);

		pci_release_regions(pdev);

		pci_disable_device(pdev);