From: Vinod Koul <vkoul@kernel.org>
Date: Wed, 24 Oct 2018 08:16:04 +0000 (+0100)
Subject: Merge branch 'topic/jz' into for-linus
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=81c3ee027e5d79eb184d2b225a67b06e9e5b9271;p=linux.git

Merge branch 'topic/jz' into for-linus
---

81c3ee027e5d79eb184d2b225a67b06e9e5b9271
diff --cc drivers/dma/dma-jz4780.c
index b2a244902bc52,e1bb93dd32bae..a8b6225faa12a
--- a/drivers/dma/dma-jz4780.c
+++ b/drivers/dma/dma-jz4780.c
@@@ -881,9 -983,10 +980,9 @@@ static int jz4780_dma_remove(struct pla
  
  	free_irq(jzdma->irq, jzdma);
  
- 	for (i = 0; i < JZ_DMA_NR_CHANNELS; i++)
+ 	for (i = 0; i < jzdma->soc_data->nb_channels; i++)
  		tasklet_kill(&jzdma->chan[i].vchan.task);
  
 -	dma_async_device_unregister(&jzdma->dma_device);
  	return 0;
  }