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

Commit ff25ea8f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma 

Pull dmaengine fixes from Vinod Koul:
 "We have two small fixes:

   - pl330 termination hang fix by Krzysztof

   - hsu memory leak fix by Peter"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: hsu: Fix memory leak when stopping a running transfer
  dmaengine: pl330: Fix hang on dmaengine_terminate_all on certain boards
parents 8a7deb36 42977082

drivers/dma/hsu/hsu.c

+4 −1
Original line number Diff line number Diff line
@@ -384,7 +384,10 @@ static int hsu_dma_terminate_all(struct dma_chan *chan) 
	spin_lock_irqsave(&hsuc->vchan.lock, flags);



	hsu_dma_stop_channel(hsuc);

	if (hsuc->desc) {

		hsu_dma_desc_free(&hsuc->desc->vdesc);

		hsuc->desc = NULL;

	}



	vchan_get_all_descriptors(&hsuc->vchan, &head);

	spin_unlock_irqrestore(&hsuc->vchan.lock, flags);

drivers/dma/pl330.c

+3 −0
Original line number Diff line number Diff line
@@ -2127,6 +2127,7 @@ static int pl330_terminate_all(struct dma_chan *chan) 
	struct pl330_dmac *pl330 = pch->dmac;

	LIST_HEAD(list);



	pm_runtime_get_sync(pl330->ddma.dev);

	spin_lock_irqsave(&pch->lock, flags);

	spin_lock(&pl330->lock);

	_stop(pch->thread);
@@ -2151,6 +2152,8 @@ static int pl330_terminate_all(struct dma_chan *chan) 
	list_splice_tail_init(&pch->work_list, &pl330->desc_pool);

	list_splice_tail_init(&pch->completed_list, &pl330->desc_pool);

	spin_unlock_irqrestore(&pch->lock, flags);

	pm_runtime_mark_last_busy(pl330->ddma.dev);

	pm_runtime_put_autosuspend(pl330->ddma.dev);



	return 0;

}